android: Minor whitespace fixes.

[pulseview.git] / android / custom_rules.xml

diff --git a/android/custom_rules.xml b/android/custom_rules.xml
index 4ba1bb6e86b0be8d58354ed3b9c29f15954b5aa7..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>
@@ -29,19 +28,52 @@
                        </filterchain>
                </loadproperties>
                <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"/>
                        <include name="libgnustl_shared.so"/>
                        <exclude name="lib*.so"/>
                </copylibs>
+               <copy todir="${native.libs.absolute.dir}">
+                       <fileset dir="${prefix}/jar">
+                               <include name="QtAndroid-bundled.jar" />
+                               <include name="QtAndroidAccessibility-bundled.jar" />
+                       </fileset>
+               </copy>
+               <copy todir="${native.libs.absolute.dir}/${android.abi}">
+                       <fileset dir="${prefix}/lib">
+                               <include name="libQt5Core.so" />
+                               <include name="libQt5Gui.so" />
+                               <include name="libQt5Widgets.so" />
+                               <include name="libQt5Svg.so" />
+                       </fileset>
+               </copy>
+               <copy todir="${native.libs.absolute.dir}/${android.abi}">
+                       <fileset dir="${prefix}/plugins">
+                               <include name="platforms/android/libqtforandroid.so"/>
+                               <include name="platforms/libqeglfs.so"/>
+                               <include name="platforms/libqminimal.so"/>
+                               <include name="platforms/libqminimalegl.so"/>
+                               <include name="platforms/libqoffscreen.so"/>
+                               <include name="generic/libqevdevkeyboardplugin.so"/>
+                               <include name="generic/libqevdevmouseplugin.so"/>
+                               <include name="generic/libqevdevtabletplugin.so"/>
+                               <include name="generic/libqevdevtouchplugin.so"/>
+                               <include name="imageformats/libqsvg.so"/>
+                               <include name="iconengines/libqsvgicon.so"/>
+                               <include name="accessible/libqtaccessiblewidgets.so"/>
+                       </fileset>
+                       <filtermapper>
+                               <replacestring from="/" to="_" />
+                               <prefixlines prefix="libplugins_" />
+                       </filtermapper>
+               </copy>
                <copy file="${prefix}/jar/sigrok-androidutils.jar"
                        tofile="${jar.libs.absolute.dir}/sigrok-androidutils.jar"/>
                <copy file="${prefix}/share/sigrok-androidutils/device_filter.xml"