From 69975c709487d29877c9461a914c7ba297212a13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Konstantin=20K=C3=A4fer?= Date: Fri, 30 Jan 2015 18:33:36 +0100 Subject: make different abis for android --- scripts/android_env.sh | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) (limited to 'scripts') diff --git a/scripts/android_env.sh b/scripts/android_env.sh index 6cbce61dc6..f91d7628e5 100755 --- a/scripts/android_env.sh +++ b/scripts/android_env.sh @@ -5,16 +5,19 @@ set -o pipefail ./scripts/local_mason.sh -echo CXX=\""`MASON_DIR=.mason MASON_PLATFORM=android .mason/mason env CXX`"\" -echo CC=\""`MASON_DIR=.mason MASON_PLATFORM=android .mason/mason env CC`"\" -echo LD=\""`MASON_DIR=.mason MASON_PLATFORM=android .mason/mason env LD`"\" -echo LINK=\""`MASON_DIR=.mason MASON_PLATFORM=android .mason/mason env CXX`"\" -echo AR=\""`MASON_DIR=.mason MASON_PLATFORM=android .mason/mason env AR`"\" -echo RANLIB=\""`MASON_DIR=.mason MASON_PLATFORM=android .mason/mason env RANLIB`"\" -echo LDFLAGS=\""`MASON_DIR=.mason MASON_PLATFORM=android .mason/mason env LDFLAGS` ${LDFLAGS}"\" -echo CFLAGS=\""`MASON_DIR=.mason MASON_PLATFORM=android .mason/mason env CFLAGS` ${CFLAGS}"\" -echo CPPFLAGS=\""`MASON_DIR=.mason MASON_PLATFORM=android .mason/mason env CPPFLAGS` ${CPPFLAGS}"\" -echo PATH=\""`MASON_DIR=.mason MASON_PLATFORM=android .mason/mason env PATH`"\" -echo JNIDIR=\""`MASON_DIR=.mason MASON_PLATFORM=android .mason/mason env JNIDIR`"\" +export MASON_PLATFORM=android -echo MASON_PLATFORM=\"android\" \ No newline at end of file +echo MASON_PLATFORM=\"android\" +echo MASON_ANDROID_ABI=\"${MASON_ANDROID_ABI}\" + +echo CXX=\"`.mason/mason env CXX`\" +echo CC=\"`.mason/mason env CC`\" +echo LD=\"`.mason/mason env LD`\" +echo LINK=\"`.mason/mason env CXX`\" +echo AR=\"`.mason/mason env AR`\" +echo RANLIB=\"`.mason/mason env RANLIB`\" +echo LDFLAGS=\"`.mason/mason env LDFLAGS` ${LDFLAGS}\" +echo CFLAGS=\"`.mason/mason env CFLAGS` ${CFLAGS}\" +echo CPPFLAGS=\"`.mason/mason env CPPFLAGS` ${CPPFLAGS}\" +echo PATH=\"`.mason/mason env PATH`\" +echo JNIDIR=\"`.mason/mason env JNIDIR`\" -- cgit v1.2.1