Fixed binaries stripping.

2 files changed, 39 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c12bb0210fd3..f5f49ace4db7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,10 @@
 # Generated by mksrcinfo v8
-# dom jun 11 21:44:05 UTC 2017
+# sáb jun 24 21:22:24 UTC 2017
 pkgbase = android-qt5-x86
 	pkgdesc = Qt 5 for Android
 	pkgver = 5.9.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://www.qt.io
-	arch = i686
 	arch = x86_64
 	groups = android-qt5
 	license = GPL3
@@ -27,6 +26,10 @@ pkgbase = android-qt5-x86
 	depends = android-sdk-platform-tools
 	optdepends = android-google-apis-x86: AVD support
 	optdepends = android-x86-system-image: AVD support
+	options = !strip
+	options = !buildflags
+	options = staticlibs
+	options = !emptydirs
 	source = http://download.qt-project.org/official_releases/qt/5.9/5.9.0/single/qt-everywhere-opensource-src-5.9.0.tar.xz
 	source = JavaScriptCore.pri.patch
 	source = geoservices.pro.patch
diff --git a/PKGBUILD b/PKGBUILD
index c7aac4a1e2bc..924f0427efd8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,9 +8,9 @@ android_arch=x86
 _pkgname=android-qt5
 pkgname=${_pkgname}-${android_arch}
 pkgver=5.9.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Qt 5 for Android"
-arch=('i686' 'x86_64')
+arch=('x86_64')
 url='https://www.qt.io'
 license=('GPL3' 'LGPL')
 makedepends=('libgl'
@@ -48,6 +48,7 @@ case "$android_arch" in
 esac
 
 _pkgfqn="qt-everywhere-opensource-src-${pkgver}"
+options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
 source=("http://download.qt-project.org/official_releases/qt/${pkgver:0:3}/${pkgver}/single/${_pkgfqn}.tar.xz"
         "JavaScriptCore.pri.patch"
         "geoservices.pro.patch")
@@ -163,5 +164,35 @@ build() {
 
 package() {
     cd ${_pkgfqn}
+
     make INSTALL_ROOT=${pkgdir} install
+
+    case "$android_arch" in
+        arm64-v8a)
+            toolchain=aarch64-linux-android-4.9
+            stripFolder=aarch64-linux-android
+            ;;
+        armeabi*)
+            toolchain=arm-linux-androideabi-4.9
+            stripFolder=arm-linux-androideabi
+            ;;
+        mips)
+            toolchain=mipsel-linux-android-4.9
+            stripFolder=mipsel-linux-android
+            ;;
+        x86)
+            toolchain=x86-4.9
+            stripFolder=i686-linux-android
+            ;;
+        x86_64)
+            toolchain=x86_64-4.9
+            stripFolder=x86_64-linux-android
+            ;;
+    esac
+
+    export ANDROID_NDK_ROOT=/opt/android-ndk
+    STRIP=${ANDROID_NDK_ROOT}/toolchains/${toolchain}/prebuilt/linux-x86_64/${stripFolder}/bin/strip
+    find ${pkgdir}/opt/${_pkgname}/${pkgver}/${android_arch}/lib -name 'lib*.so' -exec ${STRIP} {} \;
+    find ${pkgdir}/opt/${_pkgname}/${pkgver}/${android_arch}/lib \( -name 'lib*.a' ! -name 'libQt5Bootstrap.a' ! -name 'libQt5QmlDevTools.a' \) -exec ${STRIP} {} \;
+    find ${pkgdir}/opt/${_pkgname}/${pkgver}/${android_arch}/plugins -name 'lib*.so' -exec ${STRIP} {} \;
 }