X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=android%2Fcustom_rules.xml;h=339b6e80eb9a82dbb80df176652a0a4c7f24afe6;hp=4ba1bb6e86b0be8d58354ed3b9c29f15954b5aa7;hb=f529583485b54ae73401daf780f8a61d1716d5f1;hpb=ad629dd65d1cf2ebf5cd359e9296b72f9ce2cbab

diff --git a/android/custom_rules.xml b/android/custom_rules.xml
index 4ba1bb6e..339b6e80 100644
--- 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,57 @@
 			</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"/>
+			<include name="libpulseview.so"/>
+			<exclude name="libQt5*.so"/>
+			<exclude name="libc.so"/>
+			<exclude name="libm.so"/>
+			<exclude name="libdl.so"/>
+			<exclude name="liblog.so"/>
+			<exclude name="libstdc++.so"/>
+			<exclude name="libz.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"/>
+			</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"
@@ -52,7 +89,7 @@
 				<filter token="bundled_libs" value="${bundled_libs}"/>
 			</filterset>
 		</copy>
-		<copy file="${pulseview-source-path}/icons/sigrok-logo-notext.png"
+		<copy file="${pulseview-source-path}/icons/pulseview.png"
 			tofile="${resource.absolute.dir}/drawable/logo.png"/>
 		<copy todir="${source.absolute.dir}">
 			<fileset dir="${prefix}/src/android/java/src">
@@ -72,7 +109,15 @@
 			<fileset dir="${prefix}/lib/python3.3">
 				<include name="**/*.py"/>
 				<exclude name="**/test/**"/>
+				<exclude name="**/tests/**"/>
+				<exclude name="**/tkinter/**"/>
+				<exclude name="**/turtledemo/**"/>
+				<exclude name="**/turtle.py"/>
+				<exclude name="**/idlelib/**"/>
 			</fileset>
 		</copy>
+		<copy todir="${asset.absolute.dir}/sigrok-firmware">
+			<fileset dir="${prefix}/share/sigrok-firmware"/>
+		</copy>
 	</target>
 </project>