Added ANDROID_WHITHOUT_CENV variable for unsettig CFLAGS et al.

3 files changed, 78 insertions, 84 deletions

diff --git a/.SRCINFO b/.SRCINFO
index be6240bbb853..181b19b0d075 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,11 @@
 pkgbase = android-environment
 	pkgdesc = Script providing common environment variables and functions for Android builds.
-	pkgver = 4
-	pkgrel = 9
+	pkgver = 5
+	pkgrel = 1
 	url = https://aur.archlinux.org/packages/android-evironment
 	arch = any
 	license = MIT
 	source = android-env.sh
-	md5sums = 290dea4706996384b9e83e7a55115aad
+	md5sums = 260d0027cabb2f1034ba55a6ac83b11a
 
 pkgname = android-environment
diff --git a/PKGBUILD b/PKGBUILD
index ac0fc0064a3f..52ae5aa69e68 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,12 +1,12 @@
 pkgname=android-environment
-pkgver=4
-pkgrel=9
+pkgver=5
+pkgrel=1
 pkgdesc='Script providing common environment variables and functions for Android builds.'
 arch=('any')
 url='https://aur.archlinux.org/packages/android-evironment'
 license=('MIT')
 source=('android-env.sh')
-md5sums=('290dea4706996384b9e83e7a55115aad')
+md5sums=('260d0027cabb2f1034ba55a6ac83b11a')
 
 package() {
     install -d ${pkgdir}/usr/bin
diff --git a/android-env.sh b/android-env.sh
index cc8e4708ccef..d425d71d6a94 100755
--- a/android-env.sh
+++ b/android-env.sh
@@ -18,10 +18,10 @@ if [ -z "${ANDROID_NDK_HOME}" ]; then
     export ANDROID_NDK_HOME=/opt/android-ndk
 fi
 
-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_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"
 
 # Minimum Android platform based on:
 #
@@ -38,117 +38,111 @@ get_last() {
 }
 
 if [ -z "${ANDROID_BUILD_TOOLS_REVISION}" ]; then
-    export ANDROID_BUILD_TOOLS_REVISION=$(get_last ${ANDROID_HOME}/build-tools)
+    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
+    export ANDROID_API_VERSION="android-${ANDROID_MINIMUM_PLATFORM}"
 fi
 
 if [ -z "${ANDROID_NDK_PLATFORM}" ]; then
-    export ANDROID_NDK_PLATFORM=android-$ANDROID_MINIMUM_PLATFORM
+    export ANDROID_NDK_PLATFORM="android-${ANDROID_MINIMUM_PLATFORM}"
 fi
 
-export ANDROID_SDK_PLATFORM=${ANDROID_HOME}/platforms/$ANDROID_API_VERSION
-export ANDROID_PLATFORM=${ANDROID_NDK_HOME}/platforms/$ANDROID_NDK_PLATFORM
-export ANDROID_PKGCONFIG=android-${_android_arch}-pkg-config
+export ANDROID_SDK_PLATFORM="${ANDROID_HOME}/platforms/${ANDROID_API_VERSION}"
+export ANDROID_PLATFORM="${ANDROID_NDK_HOME}/platforms/${ANDROID_NDK_PLATFORM}"
+export ANDROID_PKGCONFIG="android-${_android_arch}-pkg-config"
 
 case "${_android_arch}" in
     aarch64)
-        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_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_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_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_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_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_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_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_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_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
         ;;
     *)
-        export ANDROID_SYSROOT_INCLUDE_ABI=${ANDROID_SYSROOT_INCLUDE}/${_android_arch}-linux-android
-        export ANDROID_SYSROOT_LIB=${ANDROID_SYSROOT}/usr/lib/${_android_arch}-linux-android
-        export ANDROID_TOOLS_COMPILER_PREFIX=${ANDROID_CROSS_PREFIX}/${_android_arch}-linux-android${ANDROID_MINIMUM_PLATFORM}-
+        export ANDROID_SYSROOT_INCLUDE_ABI="${ANDROID_SYSROOT_INCLUDE}/${_android_arch}-linux-android"
+        export ANDROID_SYSROOT_LIB="${ANDROID_SYSROOT}/usr/lib/${_android_arch}-linux-android"
+        export ANDROID_TOOLS_COMPILER_PREFIX="${ANDROID_CROSS_PREFIX}/${_android_arch}-linux-android${ANDROID_MINIMUM_PLATFORM}-"
         export ANDROID_ABI=${_android_arch}
         ;;
 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++
-export ANDROID_TOOLS_PREFIX=${ANDROID_CROSS_PREFIX}/llvm-
-export ANDROID_AR=${ANDROID_TOOLS_PREFIX}ar
-export ANDROID_AS=${ANDROID_TOOLS_PREFIX}as
-export ANDROID_LD=${ANDROID_CROSS_PREFIX}/ld
-export ANDROID_NM=${ANDROID_TOOLS_PREFIX}nm
-export ANDROID_OBJCOPY=${ANDROID_TOOLS_PREFIX}objcopy
-export ANDROID_OBJDUMP=${ANDROID_TOOLS_PREFIX}objdump
-export ANDROID_RANLIB=${ANDROID_TOOLS_PREFIX}ranlib
-export ANDROID_STRIP=${ANDROID_TOOLS_PREFIX}strip
+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++"
+export ANDROID_TOOLS_PREFIX="${ANDROID_CROSS_PREFIX}/llvm-"
+export ANDROID_AR="${ANDROID_TOOLS_PREFIX}ar"
+export ANDROID_AS="${ANDROID_TOOLS_PREFIX}as"
+export ANDROID_LD="${ANDROID_CROSS_PREFIX}/ld"
+export ANDROID_NM="${ANDROID_TOOLS_PREFIX}nm"
+export ANDROID_OBJCOPY="${ANDROID_TOOLS_PREFIX}objcopy"
+export ANDROID_OBJDUMP="${ANDROID_TOOLS_PREFIX}objdump"
+export ANDROID_RANLIB="${ANDROID_TOOLS_PREFIX}ranlib"
+export ANDROID_STRIP="${ANDROID_TOOLS_PREFIX}strip"
 
 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
-export ANDROID_PREFIX_LIB=${ANDROID_PREFIX}/lib
-export ANDROID_PREFIX_ETC=${ANDROID_PREFIX}/etc
-export ANDROID_PREFIX_SHARE=${ANDROID_PREFIX}/share
-export ANDROID_PREFIX_VAR=${ANDROID_PREFIX}/var
-export PKG_CONFIG_SYSROOT_DIR=${ANDROID_PREFIX}
-export PKG_CONFIG_LIBDIR=${ANDROID_PREFIX_LIB}/pkgconfig:${ANDROID_PREFIX_SHARE}/pkgconfig
-
-export CC=${ANDROID_CC}
-export CXX=${ANDROID_CXX}
-
-[[ "${CFLAGS}" != *-O2* ]] && export CFLAGS="${CFLAGS} -O2"
-[[ "${CFLAGS}" != *-pipe* ]] && export CFLAGS="${CFLAGS} -pipe"
-[[ "${CFLAGS}" != *-fno-plt* ]] && export CFLAGS="${CFLAGS} -fno-plt"
-[[ "${CFLAGS}" != *-fexceptions* ]] && export CFLAGS="${CFLAGS} -fexceptions"
-[[ "${CFLAGS}" != *-I${ANDROID_PREFIX_INCLUDE}* ]] && export CFLAGS="${CFLAGS} -I${ANDROID_PREFIX_INCLUDE}"
-[[ "${CPPFLAGS}" != *-D_FORTIFY_SOURCE=* ]] && export CPPFLAGS="${CPPFLAGS} -D_FORTIFY_SOURCE=2"
-[[ "${CPPFLAGS}" != *-D__USE_FORTIFY_LEVEL=* ]] && export CPPFLAGS="${CPPFLAGS} -D__USE_FORTIFY_LEVEL=2"
-[[ "${CPPFLAGS}" != *-I${ANDROID_PREFIX_INCLUDE}* ]] && export CPPFLAGS="${CPPFLAGS} -I${ANDROID_PREFIX_INCLUDE}"
-[[ "${CXXFLAGS}" != *-O2* ]] && export CXXFLAGS="${CXXFLAGS} -O2"
-[[ "${CXXFLAGS}" != *-pipe* ]] && export CXXFLAGS="${CXXFLAGS} -pipe"
-[[ "${CXXFLAGS}" != *-fno-plt* ]] && export CXXFLAGS="${CXXFLAGS} -fno-plt"
-[[ "${CXXFLAGS}" != *-fexceptions* ]] && export CXXFLAGS="${CXXFLAGS} -fexceptions"
-[[ "${CXXFLAGS}" != *-I${ANDROID_PREFIX_INCLUDE}* ]] && export CXXFLAGS="${CXXFLAGS} -I${ANDROID_PREFIX_INCLUDE}"
-[[ "${LDFLAGS}" != *-Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now* ]] && export LDFLAGS="${LDFLAGS} -Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now"
-[[ "${LDFLAGS}" != *-L${ANDROID_PREFIX_LIB}* ]] && export LDFLAGS="${LDFLAGS} -L${ANDROID_PREFIX_LIB}"
-
-export AR=${ANDROID_AR}
-export LD=${ANDROID_LD}
-export NM=${ANDROID_NM}
-export OBJCOPY=${ANDROID_OBJCOPY}
-export OBJDUMP=${ANDROID_OBJDUMP}
-export RANLIB=${ANDROID_RANLIB}
-export STRIP=${ANDROID_STRIP}
+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"
+export ANDROID_PREFIX_LIB="${ANDROID_PREFIX}/lib"
+export ANDROID_PREFIX_ETC="${ANDROID_PREFIX}/etc"
+export ANDROID_PREFIX_SHARE="${ANDROID_PREFIX}/share"
+export ANDROID_PREFIX_VAR="${ANDROID_PREFIX}/var"
+export PKG_CONFIG_SYSROOT_DIR="${ANDROID_PREFIX}"
+export PKG_CONFIG_LIBDIR="${ANDROID_PREFIX_LIB}/pkgconfig:${ANDROID_PREFIX_SHARE}/pkgconfig"
+
+export ANDROID_CFLAGS="${ANDROID_CFLAGS} -O2-pipe-fno-plt -fexceptions -I${ANDROID_PREFIX_INCLUDE}"
+export ANDROID_CPPFLAGS="${ANDROID_CPPFLAGS} -D_FORTIFY_SOURCE=2 -D__USE_FORTIFY_LEVEL=2 -I${ANDROID_PREFIX_INCLUDE}"
+export ANDROID_CXXFLAGS="${ANDROID_CXXFLAGS} -O2 -pipe -fno-plt -fexceptions -I${ANDROID_PREFIX_INCLUDE}"
+export ANDROID_LDFLAGS="${ANDROID_LDFLAGS} -Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now -L${ANDROID_PREFIX_LIB}"
+
+if [ -z "${ANDROID_WHITHOUT_CENV}" ]; then
+    export CC="${ANDROID_CC}"
+    export CXX="${ANDROID_CXX}"
+    export AR="${ANDROID_AR}"
+    export LD="${ANDROID_LD}"
+    export NM="${ANDROID_NM}"
+    export OBJCOPY="${ANDROID_OBJCOPY}"
+    export OBJDUMP="${ANDROID_OBJDUMP}"
+    export RANLIB="${ANDROID_RANLIB}"
+    export STRIP="${ANDROID_STRIP}"
+    export CFLAGS="${CFLAGS} ${ANDROID_CFLAGS}"
+    export CPPFLAGS="${CPPFLAGS} ${ANDROID_CPPFLAGS}"
+    export CXXFLAGS="${CXXFLAGS} ${ANDROID_CXXFLAGS}"
+    export LDFLAGS="${LDFLAGS} ${ANDROID_LDFLAGS}"
+fi
 
 ndk_version() {
-    grep 'Pkg.Revision' ${ANDROID_NDK_HOME}/source.properties | awk '{print $3}'
+    grep 'Pkg.Revision' "${ANDROID_NDK_HOME}/source.properties" | awk '{print $3}'
 }
 
 check_ndk_version_ge_than() {