Added new environment variables and flags.

4 files changed, 20 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 663806afb63d..f04f21f5609b 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 = 2
+	pkgrel = 3
 	url = https://aur.archlinux.org/packages/android-evironment
 	arch = any
 	license = MIT
 	source = android-env.sh
-	md5sums = SKIP
+	md5sums = 7be36fb56e0433dcd6e7ba7758071c67
 
 pkgname = android-environment
diff --git a/.gitignore b/.gitignore
index 52b0b8351e95..cc1a4a8b34d2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 pkg
 src
 *.tar.xz
+*.zst
 *.kate-swp
diff --git a/PKGBUILD b/PKGBUILD
index 2da3c9a4f600..b316af9ef228 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,12 +1,12 @@
 pkgname=android-environment
 pkgver=4
-pkgrel=2
+pkgrel=3
 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=('SKIP')
+md5sums=('7be36fb56e0433dcd6e7ba7758071c67')
 
 package() {
     install -d ${pkgdir}/usr/bin
diff --git a/android-env.sh b/android-env.sh
index 4c4f05adf5d0..596c86995512 100755
--- a/android-env.sh
+++ b/android-env.sh
@@ -111,9 +111,21 @@ export PKG_CONFIG_LIBDIR=${ANDROID_PREFIX_LIB}/pkgconfig:${ANDROID_PREFIX_SHARE}
 
 export CC=${ANDROID_CC}
 export CXX=${ANDROID_CXX}
-export CFLAGS="-I${ANDROID_PREFIX_INCLUDE} ${CFLAGS}"
-export CXXFLAGS="-I${ANDROID_PREFIX_INCLUDE} ${CXXFLAGS}"
-export LDFLAGS="-L${ANDROID_PREFIX_LIB} ${LDFLAGS}"
+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}"
+export AR=${ANDROID_AR}
+export OBJDUMP=${ANDROID_OBJDUMP}
+export RANLIB=${ANDROID_RANLIB}
+export STRIP=${ANDROID_STRIP}
 
 ndk_version() {
     grep 'Pkg.Revision' ${ANDROID_NDK_HOME}/source.properties | awk '{print $3}'