X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=android%2Fcustom_rules.xml;h=339b6e80eb9a82dbb80df176652a0a4c7f24afe6;hb=b5d20c6d003d853ad0828d15b365988519e73e88;hp=506364b9ca4d386fb4fff650d8dd7e168021114c;hpb=754602a31f1b72939e89a115a7a8f54bd0e88b6c;p=pulseview.git

diff --git a/android/custom_rules.xml b/android/custom_rules.xml
index 506364b9..339b6e80 100644
--- a/android/custom_rules.xml
+++ b/android/custom_rules.xml
@@ -37,9 +37,14 @@
 	<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"/>
-			<include name="libffi.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">
@@ -68,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="_" />
@@ -85,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">
@@ -112,5 +116,8 @@
 				<exclude name="**/idlelib/**"/>
 			</fileset>
 		</copy>
+		<copy todir="${asset.absolute.dir}/sigrok-firmware">
+			<fileset dir="${prefix}/share/sigrok-firmware"/>
+		</copy>
 	</target>
 </project>