X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=android%2Fcustom_rules.xml;h=86e0238b04287af9665bc6840435f427efefa8bc;hb=fc3e73d0730e032c6c8d49dd80ff8a3620674ebc;hp=44d66371f9fb5066d3180b1eba5fad3293630a53;hpb=1c90d94fb2928df0503b1e47f4f3a3d64b136ef1;p=pulseview.git

diff --git a/android/custom_rules.xml b/android/custom_rules.xml
index 44d6637..86e0238 100644
--- a/android/custom_rules.xml
+++ b/android/custom_rules.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-
    This file is part of the PulseView project.
 
    Copyright (C) 2014 Marcus Comstedt <marcus@mc.pp.se>
@@ -17,13 +16,11 @@
 
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
 -->
 <project>
 	<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,19 +28,52 @@
 			</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"/>
 		</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"/>
+				<include name="accessible/libqtaccessiblewidgets.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"