Export common compiler environment variables.

3 files changed, 10 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f37f011677df..cd3f9f2dcb33 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 = 6
+	pkgver = 3
+	pkgrel = 1
 	url = https://aur.archlinux.org/packages/android-evironment
 	arch = any
 	license = MIT
diff --git a/PKGBUILD b/PKGBUILD
index 100267d86d37..47519d3bb956 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=android-environment
-pkgver=2
-pkgrel=6
+pkgver=3
+pkgrel=1
 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 fba7368b4175..4ae148430465 100755
--- a/android-env.sh
+++ b/android-env.sh
@@ -90,6 +90,12 @@ export ANDROID_PREFIX_SHARE=${ANDROID_PREFIX}/share
 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="-I${ANDROID_PREFIX_INCLUDE} ${CFLAGS}"
+export CXXFLAGS="-I${ANDROID_PREFIX_INCLUDE} ${CXXFLAGS}"
+export LDFLAGS="-L${ANDROID_PREFIX_LIB} ${LDFLAGS}"
+
 ndk_version() {
     grep 'Pkg.Revision' ${ANDROID_NDK_HOME}/source.properties | awk '{print $3}'
 }