diff options
| m--------- | .mason | 0 | ||||
| -rw-r--r-- | Makefile | 1 | ||||
| -rwxr-xr-x | android/scripts/copy-files.sh | 1 |
3 files changed, 2 insertions, 0 deletions
diff --git a/.mason b/.mason -Subproject 315833a22248595fba0d2f4a53a7d9f425e6624 +Subproject 3833ddbd71dfed6d6325429518bb22bbf94b7a9 @@ -88,6 +88,7 @@ android: export LINK="`MASON_DIR=./.mason MASON_PLATFORM=android MASON_ANDROID_ABI=${MASON_ANDROID_ABI} ./.mason/mason env CXX`" && \ export AR="`MASON_DIR=./.mason MASON_PLATFORM=android MASON_ANDROID_ABI=${MASON_ANDROID_ABI} ./.mason/mason env AR`" && \ export RANLIB="`MASON_DIR=./.mason MASON_PLATFORM=android MASON_ANDROID_ABI=${MASON_ANDROID_ABI} ./.mason/mason env RANLIB`" && \ + export STRIP="`MASON_DIR=./.mason MASON_PLATFORM=android MASON_ANDROID_ABI=${MASON_ANDROID_ABI} ./.mason/mason env STRIP`" && \ export LDFLAGS="`MASON_DIR=./.mason MASON_PLATFORM=android MASON_ANDROID_ABI=${MASON_ANDROID_ABI} ./.mason/mason env LDFLAGS` ${LDFLAGS}" && \ export CFLAGS="`MASON_DIR=./.mason MASON_PLATFORM= MASON_ANDROID_ABI=${MASON_ANDROID_ABI} ./.mason/mason env CFLAGS` ${CFLAGS}" && \ export CPPFLAGS="`MASON_DIR=./.mason MASON_PLATFORM=android MASON_ANDROID_ABI=${MASON_ANDROID_ABI} ./.mason/mason env CPPFLAGS` ${CPPFLAGS}" && \ diff --git a/android/scripts/copy-files.sh b/android/scripts/copy-files.sh index d473e48ff7..26de6068e5 100755 --- a/android/scripts/copy-files.sh +++ b/android/scripts/copy-files.sh @@ -5,6 +5,7 @@ set -o pipefail mkdir -p android/java/lib/src/main/jniLibs/${JNIDIR} cp build/android/${MASON_ANDROID_ABI}/out/${BUILDTYPE}/lib.target/libmapbox-gl.so android/java/lib/src/main/jniLibs/${JNIDIR}/libmapbox-gl.so +${STRIP} --strip-unneeded android/java/lib/src/main/jniLibs/${JNIDIR}/libmapbox-gl.so mkdir -p android/java/lib/src/main/assets cp build/android/${MASON_ANDROID_ABI}/out/${BUILDTYPE}/ca-bundle.crt android/java/lib/src/main/assets/ca-bundle.crt cp -r build/android/${MASON_ANDROID_ABI}/out/${BUILDTYPE}/styles android/java/lib/src/main/assets/styles |