Fixed ANDROID_TOOLS_PREFIX.

3 files changed, 4 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 13ff983d8035..a8387a7da4df 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 = 4
+	pkgrel = 5
 	url = https://aur.archlinux.org/packages/android-evironment
 	arch = any
 	license = MIT
diff --git a/PKGBUILD b/PKGBUILD
index b16837eafc4e..fdcea90cebb8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=android-environment
 pkgver=2
-pkgrel=4
+pkgrel=5
 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 49a92dfc6bc5..45eb26005440 100755
--- a/android-env.sh
+++ b/android-env.sh
@@ -51,33 +51,30 @@ 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-
         export ANDROID_ABI=arm64-v8a
         ;;
     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-
         export ANDROID_ABI=armeabi-v7a
         ;;
     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-
         export ANDROID_ABI=x86
         ;;
     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-
         export ANDROID_ABI=x86_64
         ;;
 esac
 
 export ANDROID_CC=${ANDROID_TOOLS_COMPILER_PREFIX}clang
 export ANDROID_CXX=${ANDROID_TOOLS_COMPILER_PREFIX}clang++
+export ANDROID_TOOLS_PREFIX=${ANDROID_CROSS_PREFIX}/llvm-
 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_CROSS_PREFIX}/llvm-strip
+export ANDROID_STRIP=${ANDROID_TOOLS_PREFIX}strip
 export ANDROID_PREFIX=/opt/android-libs/${_android_arch}
 export ANDROID_PREFIX_USR=${ANDROID_PREFIX}/usr
 export ANDROID_PREFIX_BIN=${ANDROID_PREFIX}/bin