Added ANDROID_EXTERNAL_LIBS variable for customizing the libraries install directory.

3 files changed, 8 insertions, 3 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a8387a7da4df..f37f011677df 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = android-environment
 	pkgdesc = Script providing common environment variables and functions for Android builds.
 	pkgver = 2
-	pkgrel = 5
+	pkgrel = 6
 	url = https://aur.archlinux.org/packages/android-evironment
 	arch = any
 	license = MIT
diff --git a/PKGBUILD b/PKGBUILD
index fdcea90cebb8..100267d86d37 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=android-environment
 pkgver=2
-pkgrel=5
+pkgrel=6
 pkgdesc='Script providing common environment variables and functions for Android builds.'
 arch=('any')
 url='https://aur.archlinux.org/packages/android-evironment'
diff --git a/android-env.sh b/android-env.sh
index 45eb26005440..fba7368b4175 100755
--- a/android-env.sh
+++ b/android-env.sh
@@ -75,7 +75,12 @@ 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_PREFIX=/opt/android-libs/${_android_arch}
+
+if [ -z "${ANDROID_EXTERNAL_LIBS}" ]; then
+    export ANDROID_EXTERNAL_LIBS=/opt/android-libs
+fi
+
+export ANDROID_PREFIX=${ANDROID_EXTERNAL_LIBS}/${_android_arch}
 export ANDROID_PREFIX_USR=${ANDROID_PREFIX}/usr
 export ANDROID_PREFIX_BIN=${ANDROID_PREFIX}/bin
 export ANDROID_PREFIX_INCLUDE=${ANDROID_PREFIX}/include