diff --git a/qt5/android-aarch64/PKGBUILD b/qt5/android-aarch64/PKGBUILD
index 805be3d6..d58c254c 100644
--- a/qt5/android-aarch64/PKGBUILD
+++ b/qt5/android-aarch64/PKGBUILD
@@ -26,6 +26,7 @@ makedepends=('libgl'
              'libxslt'
              'fontconfig'
              'java-environment-openjdk<=8'
+             'android-environment'
              'android-pkg-config'
              "android-$_pkg_arch-openssl")
 depends=('java-runtime-headless-openjdk<=8'
@@ -68,19 +69,17 @@ source=("http://download.qt-project.org/official_releases/qt/${pkgver:0:4}/${pkg
         '0002-Fix-androiddeployqt-search-paths.patch'
         '0003-Support-pkg-config-under-Android.patch'
         '0004-Android-Fix-build-with-NDKr20.patch'
-        '0001-Disable-mapboxgl.patch'
-        'android-env.sh')
+        '0001-Disable-mapboxgl.patch')
 sha256sums=('2cba31e410e169bd5cdae159f839640e672532a4687ea0f265f686421e0e86d6'
             'f38adf77126c692bf61bb90f31742539b942edc45975a375b87ff3a86a058adf'
             '3f018a24adfc6567fff35605731f7c34fde456db071221941d1a3c6330601741'
             'a79934eb95c131eba9b776c387339c8bf1b20ad3ac0eea629b3ee3470679ee61'
             'c1c732f65fcb97c57969f76e1257caa6f6c2872b65b438447a92cc7a43b4182f'
-            'b4755f99e6f9ab1df2650e13fa395b9706ee248d21309fed4270e69d201521c1'
-            'c4bffe85aa675c1c1a76dda36c154154eccfcee353db6cafe2318c3848e23fb1')
+            'b4755f99e6f9ab1df2650e13fa395b9706ee248d21309fed4270e69d201521c1')
 
 prepare() {
     export ANDROID_MINIMUM_PLATFORM=${_android_platform}
-    source android-env.sh ${_pkg_arch} ${_android_arch}
+    source android-env ${_pkg_arch}
 
     cd ${_pkgfqn}
     	
@@ -106,7 +105,7 @@ prepare() {
 
 build() {
     export ANDROID_MINIMUM_PLATFORM=${_android_platform}
-    source android-env.sh  ${_pkg_arch} ${_android_arch}
+    source android-env ${_pkg_arch}
 
     unset CC CXX CFLAGS CXXFLAGS LDFLAGS CHOST QMAKESPEC QTDIR CARCH
 
@@ -161,7 +160,7 @@ build() {
 
 package() {
     export ANDROID_MINIMUM_PLATFORM=${_android_platform}
-    source android-env.sh  ${_pkg_arch} ${_android_arch}
+    source android-env ${_pkg_arch}
 
     cd ${_pkgfqn}
 
diff --git a/qt5/android-aarch64/android-env.sh b/qt5/android-aarch64/android-env.sh
deleted file mode 100755
index c5c63175..00000000
--- a/qt5/android-aarch64/android-env.sh
+++ /dev/null
@@ -1,97 +0,0 @@
-#!/bin/sh
-
-# Useful link to keep track of latest API changes:
-#
-# https://developer.android.com/ndk/downloads/revision_history
-
-_pkg_arch=$1
-_android_arch=$2
-
-# Minimum Android platform based on:
-#
-# https://developer.android.com/about/dashboards/
-if [ -z "${ANDROID_MINIMUM_PLATFORM}" ]; then
-    export ANDROID_MINIMUM_PLATFORM=22
-fi
-
-if [ -z "${ANDROID_NDK_HOME}" ]; then
-    export ANDROID_NDK_HOME=/opt/android-ndk
-fi
-
-if [ -z "${ANDROID_HOME}" ]; then
-    export ANDROID_HOME=/opt/android-sdk
-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-${_pkg_arch}-pkg-config
-
-case "$_pkg_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_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/${_pkg_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
-}
diff --git a/qt5/android-armv7a-eabi/PKGBUILD b/qt5/android-armv7a-eabi/PKGBUILD
index aaaa4e5c..25b7101f 100644
--- a/qt5/android-armv7a-eabi/PKGBUILD
+++ b/qt5/android-armv7a-eabi/PKGBUILD
@@ -26,6 +26,7 @@ makedepends=('libgl'
              'libxslt'
              'fontconfig'
              'java-environment-openjdk<=8'
+             'android-environment'
              'android-pkg-config'
              "android-$_pkg_arch-openssl")
 depends=('java-runtime-headless-openjdk<=8'
@@ -68,19 +69,17 @@ source=("http://download.qt-project.org/official_releases/qt/${pkgver:0:4}/${pkg
         '0002-Fix-androiddeployqt-search-paths.patch'
         '0003-Support-pkg-config-under-Android.patch'
         '0004-Android-Fix-build-with-NDKr20.patch'
-        '0001-Disable-mapboxgl.patch'
-        'android-env.sh')
+        '0001-Disable-mapboxgl.patch')
 sha256sums=('2cba31e410e169bd5cdae159f839640e672532a4687ea0f265f686421e0e86d6'
             'f38adf77126c692bf61bb90f31742539b942edc45975a375b87ff3a86a058adf'
             '3f018a24adfc6567fff35605731f7c34fde456db071221941d1a3c6330601741'
             'a79934eb95c131eba9b776c387339c8bf1b20ad3ac0eea629b3ee3470679ee61'
             'c1c732f65fcb97c57969f76e1257caa6f6c2872b65b438447a92cc7a43b4182f'
-            'b4755f99e6f9ab1df2650e13fa395b9706ee248d21309fed4270e69d201521c1'
-            'c4bffe85aa675c1c1a76dda36c154154eccfcee353db6cafe2318c3848e23fb1')
+            'b4755f99e6f9ab1df2650e13fa395b9706ee248d21309fed4270e69d201521c1')
 
 prepare() {
     export ANDROID_MINIMUM_PLATFORM=${_android_platform}
-    source android-env.sh ${_pkg_arch} ${_android_arch}
+    source android-env ${_pkg_arch}
 
     cd ${_pkgfqn}
     	
@@ -106,7 +105,7 @@ prepare() {
 
 build() {
     export ANDROID_MINIMUM_PLATFORM=${_android_platform}
-    source android-env.sh  ${_pkg_arch} ${_android_arch}
+    source android-env ${_pkg_arch}
 
     unset CC CXX CFLAGS CXXFLAGS LDFLAGS CHOST QMAKESPEC QTDIR CARCH
 
@@ -161,7 +160,7 @@ build() {
 
 package() {
     export ANDROID_MINIMUM_PLATFORM=${_android_platform}
-    source android-env.sh  ${_pkg_arch} ${_android_arch}
+    source android-env ${_pkg_arch}
 
     cd ${_pkgfqn}
 
diff --git a/qt5/android-armv7a-eabi/android-env.sh b/qt5/android-armv7a-eabi/android-env.sh
deleted file mode 100755
index c5c63175..00000000
--- a/qt5/android-armv7a-eabi/android-env.sh
+++ /dev/null
@@ -1,97 +0,0 @@
-#!/bin/sh
-
-# Useful link to keep track of latest API changes:
-#
-# https://developer.android.com/ndk/downloads/revision_history
-
-_pkg_arch=$1
-_android_arch=$2
-
-# Minimum Android platform based on:
-#
-# https://developer.android.com/about/dashboards/
-if [ -z "${ANDROID_MINIMUM_PLATFORM}" ]; then
-    export ANDROID_MINIMUM_PLATFORM=22
-fi
-
-if [ -z "${ANDROID_NDK_HOME}" ]; then
-    export ANDROID_NDK_HOME=/opt/android-ndk
-fi
-
-if [ -z "${ANDROID_HOME}" ]; then
-    export ANDROID_HOME=/opt/android-sdk
-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-${_pkg_arch}-pkg-config
-
-case "$_pkg_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_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/${_pkg_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
-}
diff --git a/qt5/android-x86-64/PKGBUILD b/qt5/android-x86-64/PKGBUILD
index 09a46670..11b66597 100644
--- a/qt5/android-x86-64/PKGBUILD
+++ b/qt5/android-x86-64/PKGBUILD
@@ -26,6 +26,7 @@ makedepends=('libgl'
              'libxslt'
              'fontconfig'
              'java-environment-openjdk<=8'
+             'android-environment'
              'android-pkg-config'
              "android-$_pkg_arch-openssl")
 depends=('java-runtime-headless-openjdk<=8'
@@ -68,19 +69,17 @@ source=("http://download.qt-project.org/official_releases/qt/${pkgver:0:4}/${pkg
         '0002-Fix-androiddeployqt-search-paths.patch'
         '0003-Support-pkg-config-under-Android.patch'
         '0004-Android-Fix-build-with-NDKr20.patch'
-        '0001-Disable-mapboxgl.patch'
-        'android-env.sh')
+        '0001-Disable-mapboxgl.patch')
 sha256sums=('2cba31e410e169bd5cdae159f839640e672532a4687ea0f265f686421e0e86d6'
             'f38adf77126c692bf61bb90f31742539b942edc45975a375b87ff3a86a058adf'
             '3f018a24adfc6567fff35605731f7c34fde456db071221941d1a3c6330601741'
             'a79934eb95c131eba9b776c387339c8bf1b20ad3ac0eea629b3ee3470679ee61'
             'c1c732f65fcb97c57969f76e1257caa6f6c2872b65b438447a92cc7a43b4182f'
-            'b4755f99e6f9ab1df2650e13fa395b9706ee248d21309fed4270e69d201521c1'
-            'c4bffe85aa675c1c1a76dda36c154154eccfcee353db6cafe2318c3848e23fb1')
+            'b4755f99e6f9ab1df2650e13fa395b9706ee248d21309fed4270e69d201521c1')
 
 prepare() {
     export ANDROID_MINIMUM_PLATFORM=${_android_platform}
-    source android-env.sh ${_pkg_arch} ${_android_arch}
+    source android-env ${_pkg_arch}
 
     cd ${_pkgfqn}
     	
@@ -106,7 +105,7 @@ prepare() {
 
 build() {
     export ANDROID_MINIMUM_PLATFORM=${_android_platform}
-    source android-env.sh  ${_pkg_arch} ${_android_arch}
+    source android-env ${_pkg_arch}
 
     unset CC CXX CFLAGS CXXFLAGS LDFLAGS CHOST QMAKESPEC QTDIR CARCH
 
@@ -161,7 +160,7 @@ build() {
 
 package() {
     export ANDROID_MINIMUM_PLATFORM=${_android_platform}
-    source android-env.sh  ${_pkg_arch} ${_android_arch}
+    source android-env ${_pkg_arch}
 
     cd ${_pkgfqn}
 
diff --git a/qt5/android-x86-64/android-env.sh b/qt5/android-x86-64/android-env.sh
deleted file mode 100755
index c5c63175..00000000
--- a/qt5/android-x86-64/android-env.sh
+++ /dev/null
@@ -1,97 +0,0 @@
-#!/bin/sh
-
-# Useful link to keep track of latest API changes:
-#
-# https://developer.android.com/ndk/downloads/revision_history
-
-_pkg_arch=$1
-_android_arch=$2
-
-# Minimum Android platform based on:
-#
-# https://developer.android.com/about/dashboards/
-if [ -z "${ANDROID_MINIMUM_PLATFORM}" ]; then
-    export ANDROID_MINIMUM_PLATFORM=22
-fi
-
-if [ -z "${ANDROID_NDK_HOME}" ]; then
-    export ANDROID_NDK_HOME=/opt/android-ndk
-fi
-
-if [ -z "${ANDROID_HOME}" ]; then
-    export ANDROID_HOME=/opt/android-sdk
-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-${_pkg_arch}-pkg-config
-
-case "$_pkg_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_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/${_pkg_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
-}