Added ANDROID_SYSROOT_INCLUDE_ABI.

3 files changed, 8 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 096c244c788a..663806afb63d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = android-environment
 	pkgdesc = Script providing common environment variables and functions for Android builds.
 	pkgver = 4
-	pkgrel = 1
+	pkgrel = 2
 	url = https://aur.archlinux.org/packages/android-evironment
 	arch = any
 	license = MIT
diff --git a/PKGBUILD b/PKGBUILD
index 69f69dbcfcfe..2da3c9a4f600 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=android-environment
 pkgver=4
-pkgrel=1
+pkgrel=2
 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 afebbb1a8906..4c4f05adf5d0 100755
--- a/android-env.sh
+++ b/android-env.sh
@@ -45,44 +45,43 @@ export ANDROID_SDK_PLATFORM=${ANDROID_HOME}/platforms/$ANDROID_API_VERSION
 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_SYSROOT_INCLUDE=${ANDROID_SYSROOT}/usr/include
 export ANDROID_CROSS_PREFIX=$ANDROID_TOOLCHAIN/bin
 export ANDROID_PKGCONFIG=android-${_android_arch}-pkg-config
 
-
 case "$_android_arch" in
     aarch64)
-        export ANDROID_SYSROOT_INCLUDE=${ANDROID_SYSROOT}/usr/include/aarch64-linux-android
+        export ANDROID_SYSROOT_INCLUDE_ABI=${ANDROID_SYSROOT_INCLUDE}/aarch64-linux-android
         export ANDROID_SYSROOT_LIB=${ANDROID_SYSROOT}/usr/lib/aarch64-linux-android
         export ANDROID_TOOLS_COMPILER_PREFIX=${ANDROID_CROSS_PREFIX}/aarch64-linux-android${ANDROID_MINIMUM_PLATFORM}-
         export ANDROID_ABI=arm64-v8a
         ;;
     armv7a-eabi)
-        export ANDROID_SYSROOT_INCLUDE=${ANDROID_SYSROOT}/usr/include/arm-linux-androideabi
+        export ANDROID_SYSROOT_INCLUDE_ABI=${ANDROID_SYSROOT_INCLUDE}/arm-linux-androideabi
         export ANDROID_SYSROOT_LIB=${ANDROID_SYSROOT}/usr/lib/arm-linux-androideabi
         export ANDROID_TOOLS_COMPILER_PREFIX=${ANDROID_CROSS_PREFIX}/armv7a-linux-androideabi${ANDROID_MINIMUM_PLATFORM}-
         export ANDROID_ABI=armeabi-v7a
         ;;
     riscv64)
-        export ANDROID_SYSROOT_INCLUDE=${ANDROID_SYSROOT}/usr/include/riscv64-linux-android
+        export ANDROID_SYSROOT_INCLUDE_ABI=${ANDROID_SYSROOT_INCLUDE}/riscv64-linux-android
         export ANDROID_SYSROOT_LIB=${ANDROID_SYSROOT}/usr/lib/riscv64-linux-android
         export ANDROID_TOOLS_COMPILER_PREFIX=${ANDROID_CROSS_PREFIX}/riscv64-linux-android${ANDROID_MINIMUM_PLATFORM}-
         export ANDROID_ABI=riscv64
         ;;
     x86)
-        export ANDROID_SYSROOT_INCLUDE=${ANDROID_SYSROOT}/usr/include/i686-linux-android
+        export ANDROID_SYSROOT_INCLUDE_ABI=${ANDROID_SYSROOT_INCLUDE}/i686-linux-android
         export ANDROID_SYSROOT_LIB=${ANDROID_SYSROOT}/usr/lib/i686-linux-android
         export ANDROID_TOOLS_COMPILER_PREFIX=${ANDROID_CROSS_PREFIX}/i686-linux-android${ANDROID_MINIMUM_PLATFORM}-
         export ANDROID_ABI=x86
         ;;
     x86-64)
-        export ANDROID_SYSROOT_INCLUDE=${ANDROID_SYSROOT}/usr/include/x86_64-linux-android
+        export ANDROID_SYSROOT_INCLUDE_ABI=${ANDROID_SYSROOT_INCLUDE}/x86_64-linux-android
         export ANDROID_SYSROOT_LIB=${ANDROID_SYSROOT}/usr/lib/x86_64-linux-android
         export ANDROID_TOOLS_COMPILER_PREFIX=${ANDROID_CROSS_PREFIX}/x86_64-linux-android${ANDROID_MINIMUM_PLATFORM}-
         export ANDROID_ABI=x86_64
         ;;
 esac
 
-
 export ANDROID_SYSROOT_LIB_API=${ANDROID_SYSROOT_LIB}/${ANDROID_MINIMUM_PLATFORM}
 export ANDROID_CC=${ANDROID_TOOLS_COMPILER_PREFIX}clang
 export ANDROID_CXX=${ANDROID_TOOLS_COMPILER_PREFIX}clang++