From 14ab96c5a8a892cf76422f21b39267e582b98de1 Mon Sep 17 00:00:00 2001
From: Leith Bade <leith@mapbox.com>
Date: Thu, 29 Jan 2015 14:34:59 +1100
Subject: [PATCH] Strip android libs to reduce size

---
 .mason                        | 2 +-
 Makefile                      | 1 +
 android/scripts/copy-files.sh | 7 ++++---
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.mason b/.mason
index 315833a22..3833ddbd7 160000
--- a/.mason
+++ b/.mason
@@ -1 +1 @@
-Subproject commit 315833a22248595fba0d2f4a53a7d9f425e6624d
+Subproject commit 3833ddbd71dfed6d6325429518bb22bbf94b7a97
diff --git a/Makefile b/Makefile
index 0f8821d16..7d2fd5e6f 100644
--- a/Makefile
+++ b/Makefile
@@ -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 d473e48ff..9c8a78fb8 100755
--- a/android/scripts/copy-files.sh
+++ b/android/scripts/copy-files.sh
@@ -4,7 +4,8 @@ set -e
 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
+cp build/android/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
+cp build/android/out/${BUILDTYPE}/ca-bundle.crt android/java/lib/src/main/assets/ca-bundle.crt
+cp -r build/android/out/${BUILDTYPE}/styles android/java/lib/src/main/assets/styles