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 2f16199bd221296c3106b2113a9c72be9c0109dd..bc9c0662a0675d681906a2a519d944452b2d2b0b 100644 (file)
--- 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">