Only add missing flags.

3 files changed, 22 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f04f21f5609b..3d33310d96fc 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 = 3
+	pkgrel = 4
 	url = https://aur.archlinux.org/packages/android-evironment
 	arch = any
 	license = MIT
 	source = android-env.sh
-	md5sums = 7be36fb56e0433dcd6e7ba7758071c67
+	md5sums = 048697c7601e4cf639ce0781763b938a
 
 pkgname = android-environment
diff --git a/PKGBUILD b/PKGBUILD
index b316af9ef228..ea25a3623946 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,14 +1,14 @@
 pkgname=android-environment
 pkgver=4
-pkgrel=3
+pkgrel=4
 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=('7be36fb56e0433dcd6e7ba7758071c67')
+md5sums=('048697c7601e4cf639ce0781763b938a')
 
 package() {
     install -d ${pkgdir}/usr/bin
-    install -m755 android-env.sh  ${pkgdir}/usr/bin/android-env
+    install -m755 android-env.sh ${pkgdir}/usr/bin/android-env
 }
diff --git a/android-env.sh b/android-env.sh
index 596c86995512..598c9ee8fdab 100755
--- a/android-env.sh
+++ b/android-env.sh
@@ -106,22 +106,28 @@ 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}
-export CFLAGS="-O2 \
-               -Werror=format-security \
-               -Wformat \
-               -Wp,-D_FORTIFY_SOURCE=2 \
-               -fexceptions \
-               -fno-plt \
-               -pipe \
-               -I${ANDROID_PREFIX_INCLUDE}"
-export CXXFLAGS="${CFLAGS} -Wp,-D_GLIBCXX_ASSERTIONS"
-export LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now \
-                -L${ANDROID_PREFIX_LIB}"
+
+[[ "${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}" != *-I${ANDROID_PREFIX_INCLUDE}* ]] && export CPPFLAGS="${CPPFLAGS} -I${ANDROID_PREFIX_INCLUDE}"
+[[ "${CXXFLAGS}" != *-O2* ]] && export CCXXFLAGS="${CCXXFLAGS} -O2"
+[[ "${CXXFLAGS}" != *-pipe* ]] && export CCXXFLAGS="${CCXXFLAGS} -pipe"
+[[ "${CXXFLAGS}" != *-fno-plt* ]] && export CCXXFLAGS="${CCXXFLAGS} -fno-plt"
+[[ "${CXXFLAGS}" != *-fexceptions* ]] && export CCXXFLAGS="${CCXXFLAGS} -fexceptions"
+[[ "${CXXFLAGS}" != *-I${ANDROID_PREFIX_INCLUDE}* ]] && export CCXXFLAGS="${CCXXFLAGS} -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}" != *-I${ANDROID_PREFIX_LIB}* ]] && export LDFLAGS="${LDFLAGS} -L${ANDROID_PREFIX_LIB}"
+
 export AR=${ANDROID_AR}
 export OBJDUMP=${ANDROID_OBJDUMP}
 export RANLIB=${ANDROID_RANLIB}