summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorKonstantin Käfer <mail@kkaefer.com>2015-01-30 18:33:36 +0100
committerKonstantin Käfer <mail@kkaefer.com>2015-02-04 10:49:09 +0100
commit69975c709487d29877c9461a914c7ba297212a13 (patch)
treeea0dcbceccdc7130c6d4a6eab7284e7df5b5c6a0 /scripts
parent50d78fde85a6d2cee2e28f3681b4808b69133088 (diff)
downloadqtlocation-mapboxgl-69975c709487d29877c9461a914c7ba297212a13.tar.gz
make different abis for android
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/android_env.sh27
1 files changed, 15 insertions, 12 deletions
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`\"