From: Marcus Comstedt <redacted>
Date: Wed, 30 Sep 2015 18:22:58 +0000 (+0200)
Subject: android: Fix copylibs task to include the right libs
X-Git-Tag: pulseview-0.3.0~105
X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=commitdiff_plain;h=aaa4c0101ab06701568c8d3384f7b8df38302dac;hp=e482fa6ce81abb814fdfb3a78bb3e6c77e0185d9

android: Fix copylibs task to include the right libs

Since more and more libs are losing their versioned soname, the
heuristic of including libs with versioned sonames is an increasingly
poor one.  Instead, simply blacklist the libs we do not want.
---

diff --git a/android/custom_rules.xml b/android/custom_rules.xml
index 2f16199b..bc9c0662 100644
--- a/android/custom_rules.xml
+++ b/android/custom_rules.xml
@@ -37,10 +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="libintl.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">