android: Minor whitespace fixes.

diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index 6002c3c8971aca75ec59636ab344b2bc5830ed77..eacc0021095dc100085c889ce853b663c243051a 100644 (file)
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -50,11 +50,11 @@
                        <meta-data android:name="android.app.load_local_libs" android:value="plugins/platforms/android/libqtforandroid.so"/>
                        <meta-data android:name="android.app.load_local_jars" android:value="jar/QtAndroid.jar:jar/QtAndroidAccessibility.jar:jar/QtAndroid-bundled.jar:jar/QtAndroidAccessibility-bundled.jar"/>
                        <meta-data android:name="android.app.static_init_classes" android:value=""/>
-                       <!--  Messages maps -->
+                       <!-- Messages maps -->
                        <meta-data android:value="@string/ministro_not_found_msg" android:name="android.app.ministro_not_found_msg"/>
                        <meta-data android:value="@string/ministro_needed_msg" android:name="android.app.ministro_needed_msg"/>
                        <meta-data android:value="@string/fatal_error_msg" android:name="android.app.fatal_error_msg"/>
-                       <!--  Messages maps -->
+                       <!-- Messages maps -->
                        <!-- Splash screen -->
                        <!--
                        <meta-data android:name="android.app.splash_screen_drawable" android:resource="@drawable/logo"/>

diff --git a/android/custom_rules.xml b/android/custom_rules.xml
index b4cfe654b06d75c04ea81d05867477a93b4450e5..86e0238b04287af9665bc6840435f427efefa8bc 100644 (file)
--- a/android/custom_rules.xml
+++ b/android/custom_rules.xml
@@ -21,7 +21,6 @@
        <property name="pulseview-source-path" value="${basedir}/.."/>
        <property name="pulseview-build-path" value="${pulseview-source-path}"/>
        <property name="cmake-cache" value="${pulseview-build-path}/CMakeCache.txt"/>
-
        <target name="-get-prefix">
                <loadproperties srcFile="${cmake-cache}" prefix="cmake">
                        <filterchain>
@@ -31,12 +30,10 @@
                <property name="prefix" value="${cmake.CMAKE_INSTALL_PREFIX}"/>
                <property name="android.abi" value="${cmake.ANDROID_ABI}"/>
        </target>
-
        <target name="-declare-anttasks" depends="-get-prefix">
                <taskdef resource="anttasks.properties"
                        classpath="${prefix}/jar/sigrok-androidutils-anttasks.jar"/>
        </target>
-
        <target name="-pre-build" depends="-get-prefix, -declare-anttasks">
                <copylibs todir="${native.libs.absolute.dir}" property="bundled_libs">
                        <fileset dir="${pulseview-build-path}/libs"/>

diff --git a/android/res/values/libs.xml b/android/res/values/libs.xml
index 912a858f3e020403feef004077fd81ba89b2f39d..f9d6aada63df83b7fbd90f0253b4a9fce135c789 100644 (file)
--- a/android/res/values/libs.xml
+++ b/android/res/values/libs.xml
@@ -44,7 +44,6 @@
                <item>libplugins_iconengines_libqsvgicon.so:plugins/iconengines/libqsvgicon.so</item>
                <item>libplugins_accessible_libqtaccessiblewidgets.so:plugins/accessible/libqtaccessiblewidgets.so</item>
        </array>
-
        <array name="bundled_in_assets">
                <!-- %%INSERT_BUNDLED_IN_ASSETS%% -->
        </array>