X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=android%2Fcustom_rules.xml;h=339b6e80eb9a82dbb80df176652a0a4c7f24afe6;hp=b4cfe654b06d75c04ea81d05867477a93b4450e5;hb=5ea53b3c20d5cd80c096fb2f8d1334ae17fbce7b;hpb=b00f0979376c9af319fa929875a77f1612ce766c

diff --git a/android/custom_rules.xml b/android/custom_rules.xml
index b4cfe654..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>
@@ -31,17 +30,21 @@
 		<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">
@@ -70,7 +73,6 @@
 				<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="_" />
@@ -87,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">
@@ -107,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>