Package updated.

3 files changed, 16 insertions, 117 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9d618f7633c1..55cce5a5604a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,14 @@
 pkgbase = android-armv7a-eabi-qt5
 	pkgdesc = Qt 5 for Android
 	pkgver = 5.12.3
-	pkgrel = 2
+	pkgrel = 4
 	url = https://www.qt.io
 	install = android-armv7a-eabi-qt5.install
 	arch = any
 	groups = android-qt5
 	license = GPL3
 	license = LGPL
+	makedepends = android-environment
 	makedepends = libgl
 	makedepends = sqlite
 	makedepends = zlib
diff --git a/PKGBUILD b/PKGBUILD
index 86a8ea1fc767..c3442329e32a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,4 +1,3 @@
-# PKGCONFIG for android-qt5
 # Maintainer: Gonzalo Exequiel Pedone <hipersayan DOT x AT gmail DOT com>
 # Contributor: Jiaxi Hu <sftrytry _AT_ gmail _DOT_ com>
 # Contributor: jimmy00784 <jimmy00784@gmail.com>
@@ -6,16 +5,17 @@
 # Contributor: Martchus <martchus@gmx.net>
 
 _android_arch=armv7a-eabi
-source android-env.sh ${_android_arch}
+source android-env ${_android_arch}
 
 pkgname=android-${_android_arch}-qt5
 pkgver=5.12.3
-pkgrel=2
+pkgrel=4
 pkgdesc="Qt 5 for Android"
 arch=('any')
 url='https://www.qt.io'
 license=('GPL3' 'LGPL')
-makedepends=('libgl'
+makedepends=('android-environment'
+             'libgl'
              'sqlite'
              'zlib'
              'python2'
@@ -47,7 +47,7 @@ case "$_android_arch" in
                     "android-x86-system-image: AVD support")
         ;;
     x86-64)
-        SKIPoptdepends=("android-google-apis-x86-64: AVD support"
+        optdepends=("android-google-apis-x86-64: AVD support"
                     "android-x86-64-system-image: AVD support")
         ;;
     *)
@@ -112,9 +112,9 @@ build() {
         -confirm-license
         -opensource
         -silent
-        -prefix ${ANDROID_LIBS}
-        -examplesdir ${ANDROID_LIBS}/share/qt5/examples
-        -testsdir ${ANDROID_LIBS}/share/qt5/tests
+        -prefix ${ANDROID_PREFIX}
+        -examplesdir ${ANDROID_PREFIX_SHARE}/qt5/examples
+        -testsdir ${ANDROID_PREFIX_SHARE}/qt5/tests
         -xplatform android-clang
         -nomake tests
         -nomake examples
@@ -154,11 +154,10 @@ package() {
     cd ${_pkgfqn}
 
     make INSTALL_ROOT=${pkgdir} install
-    STRIP=${ANDROID_NDK_HOME}/toolchains/${toolchain}/prebuilt/linux-x86_64/${stripFolder}/bin/strip
-    find ${pkgdir}/${ANDROID_LIBS}/bin -type f ! -name '*.pl' -exec strip -s {} \;
-    find ${pkgdir}/${ANDROID_LIBS}/lib -type f -name 'lib*.so' -exec ${ANDROID_STRIP} -g --strip-unneeded {} \;
-#    find ${pkgdir}/${ANDROID_LIBS}/lib -type f \( -name 'lib*.a' ! -name 'libQt5Bootstrap.a' ! -name 'libQt5QmlDevTools.a' \) -exec ${ANDROID_STRIP} -g {} \;
-    find ${pkgdir}/${ANDROID_LIBS}/plugins -type f -name 'lib*.so' -exec ${ANDROID_STRIP} -g --strip-unneeded {} \;
-    find ${pkgdir}/${ANDROID_LIBS}/qml -type f -name 'lib*.so' -exec ${ANDROID_STRIP} -g --strip-unneeded {} \;
-    sed -i '/QMAKE_PRL_BUILD_DIR/d' ${pkgdir}/${ANDROID_LIBS}/lib/lib*.prl
+    find ${pkgdir}/${ANDROID_PREFIX_BIN} -type f ! -name '*.pl' -exec strip -s {} \;
+    find ${pkgdir}/${ANDROID_PREFIX_LIB} -type f -name 'lib*.so' -exec ${ANDROID_STRIP} -g --strip-unneeded {} \;
+#    find ${pkgdir}/${ANDROID_PREFIX_LIB} -type f \( -name 'lib*.a' ! -name 'libQt5Bootstrap.a' ! -name 'libQt5QmlDevTools.a' \) -exec ${ANDROID_STRIP} -g {} \;
+    find ${pkgdir}/${ANDROID_PREFIX}/plugins -type f -name 'lib*.so' -exec ${ANDROID_STRIP} -g --strip-unneeded {} \;
+    find ${pkgdir}/${ANDROID_PREFIX}/qml -type f -name 'lib*.so' -exec ${ANDROID_STRIP} -g --strip-unneeded {} \;
+    sed -i '/QMAKE_PRL_BUILD_DIR/d' ${pkgdir}/${ANDROID_PREFIX_LIB}/lib*.prl
 }
diff --git a/android-env.sh b/android-env.sh
deleted file mode 100755
index 517f38e9b563..000000000000
--- a/android-env.sh
+++ /dev/null
@@ -1,101 +0,0 @@
-#!/bin/sh
-
-# Useful link to keep track of latest API changes:
-#
-# https://developer.android.com/ndk/downloads/revision_history
-
-_android_arch=$1
-
-if [ -z "${_android_arch}" ]; then
-    _android_arch=armv7a-eabi
-fi
-
-# Minimum Android platform based on:
-#
-# http://gs.statcounter.com/os-version-market-share/android/mobile-tablet/worldwide
-if [ -z "${ANDROID_MINIMUM_PLATFORM}" ]; then
-    export ANDROID_MINIMUM_PLATFORM=22
-fi
-
-if [ -z "${ANDROID_HOME}" ]; then
-    export ANDROID_HOME=/opt/android-sdk
-fi
-
-if [ -z "${ANDROID_NDK_HOME}" ]; then
-    export ANDROID_NDK_HOME=/opt/android-ndk
-fi
-
-get_last() {
-    ls $1 | sort -V | tail -n 1
-}
-
-if [ -z "${ANDROID_BUILD_TOOLS_REVISION}" ]; then
-    export ANDROID_BUILD_TOOLS_REVISION=$(get_last ${ANDROID_HOME}/build-tools)
-fi
-
-if [ -z "${ANDROID_API_VERSION}" ]; then
-    export ANDROID_API_VERSION=android-$ANDROID_MINIMUM_PLATFORM
-fi
-
-if [ -z "${ANDROID_NDK_PLATFORM}" ]; then
-    export ANDROID_NDK_PLATFORM=android-$ANDROID_MINIMUM_PLATFORM
-fi
-
-export ANDROID_PLATFORM=${ANDROID_NDK_HOME}/platforms/$ANDROID_NDK_PLATFORM
-export ANDROID_TOOLCHAIN=${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64
-export ANDROID_SYSROOT=${ANDROID_TOOLCHAIN}/sysroot
-export ANDROID_CROSS_PREFIX=$ANDROID_TOOLCHAIN/bin/
-export ANDROID_PKGCONFIG=android-${_android_arch}-pkg-config
-
-case "$_android_arch" in
-    aarch64)
-        export ANDROID_TOOLS_COMPILER_PREFIX=${ANDROID_CROSS_PREFIX}aarch64-linux-android${ANDROID_MINIMUM_PLATFORM}-
-        export ANDROID_TOOLS_PREFIX=${ANDROID_CROSS_PREFIX}aarch64-linux-android-
-        ;;
-    armv7a-eabi)
-        export ANDROID_TOOLS_COMPILER_PREFIX=${ANDROID_CROSS_PREFIX}armv7a-linux-androideabi${ANDROID_MINIMUM_PLATFORM}-
-        export ANDROID_TOOLS_PREFIX=${ANDROID_CROSS_PREFIX}arm-linux-androideabi-
-        ;;
-    x86)
-        export ANDROID_TOOLS_COMPILER_PREFIX=${ANDROID_CROSS_PREFIX}i686-linux-android${ANDROID_MINIMUM_PLATFORM}-
-        export ANDROID_TOOLS_PREFIX=${ANDROID_CROSS_PREFIX}i686-linux-android-
-        ;;
-    x86-64)
-        export ANDROID_TOOLS_COMPILER_PREFIX=${ANDROID_CROSS_PREFIX}x86_64-linux-android${ANDROID_MINIMUM_PLATFORM}-
-        export ANDROID_TOOLS_PREFIX=${ANDROID_CROSS_PREFIX}x86_64-linux-android-
-        ;;
-esac
-
-export ANDROID_CC=${ANDROID_TOOLS_COMPILER_PREFIX}clang
-export ANDROID_CXX=${ANDROID_TOOLS_COMPILER_PREFIX}clang++
-export ANDROID_AR=${ANDROID_TOOLS_PREFIX}ar
-export ANDROID_AS=${ANDROID_TOOLS_PREFIX}as
-export ANDROID_NM=${ANDROID_TOOLS_PREFIX}nm
-export ANDROID_RANLIB=${ANDROID_TOOLS_PREFIX}ranlib
-export ANDROID_STRIP=${ANDROID_TOOLS_PREFIX}strip
-export ANDROID_LIBS=/opt/android-libs/${_android_arch}
-export PKG_CONFIG_SYSROOT_DIR=${ANDROID_LIBS}
-export PKG_CONFIG_LIBDIR=${PKG_CONFIG_SYSROOT_DIR}/lib/pkgconfig:${PKG_CONFIG_SYSROOT_DIR}/share/pkgconfig
-
-ndk_version() {
-    grep 'Pkg.Revision' ${ANDROID_NDK_HOME}/source.properties | awk '{print $3}'
-}
-
-check_ndk_version_ge_than() {
-    version=$1
-    ndk_ver=$(ndk_version)
-
-    if [ "${version}" = "${ndk_ver}" ]; then
-        return 0
-    fi
-
-    older_ver=$(printf "${version}\n${ndk_ver}" | sort -V | head -n 1)
-
-    if [ "${older_ver}" = "${ndk_ver}" ]; then
-        echo "ERROR: NDK version >= $version required."
-
-        return 1
-    fi
-
-    return 0
-}