From 883a6dc32bed8db9b78676657732189399fde6d2 Mon Sep 17 00:00:00 2001
From: Leith Bade <leith@mapbox.com>
Date: Thu, 29 Jan 2015 10:38:53 +1100
Subject: [PATCH] Use seperate build dir for each ABI

---
 Makefile                      | 6 +++---
 android/scripts/copy-files.sh | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index a33dc29d0..0f8821d16 100644
--- a/Makefile
+++ b/Makefile
@@ -94,9 +94,9 @@ android:
 	export PATH="`MASON_DIR=./.mason MASON_PLATFORM=android MASON_ANDROID_ABI=${MASON_ANDROID_ABI} ./.mason/mason env PATH`:${PATH}" && \
 	export JNIDIR="`MASON_DIR=./.mason MASON_PLATFORM=android MASON_ANDROID_ABI=${MASON_ANDROID_ABI} ./.mason/mason env JNIDIR`" && \
 	MASON_PLATFORM=android MASON_ANDROID_ABI=$(MASON_ANDROID_ABI) ./configure config-android.gypi && \
-	deps/run_gyp android/mapboxgl-app.gyp -Iconfig-android.gypi -Dplatform=android --depth=. --generator-output=./build/android -f make-android && \
-	$(MAKE) -C build/android -j$(JOBS) BUILDTYPE=$(BUILDTYPE) V=$(V) androidapp && \
-	BUILDTYPE=$(BUILDTYPE) ./android/scripts/copy-files.sh && \
+	deps/run_gyp android/mapboxgl-app.gyp -Iconfig-android.gypi -Dplatform=android --depth=. --generator-output=./build/android/$(MASON_ANDROID_ABI) -f make-android && \
+	$(MAKE) -C build/android/$(MASON_ANDROID_ABI) -j$(JOBS) BUILDTYPE=$(BUILDTYPE) V=$(V) androidapp && \
+	BUILDTYPE=$(BUILDTYPE) MASON_ANDROID_ABI=$(MASON_ANDROID_ABI) ./android/scripts/copy-files.sh && \
 	cd android/java && \
 	./gradlew --parallel-threads=$(JOBS) build
 
diff --git a/android/scripts/copy-files.sh b/android/scripts/copy-files.sh
index e7bfcb2f1..d473e48ff 100755
--- a/android/scripts/copy-files.sh
+++ b/android/scripts/copy-files.sh
@@ -4,7 +4,7 @@ set -e
 set -o pipefail
 
 mkdir -p android/java/lib/src/main/jniLibs/${JNIDIR}
-cp build/android/out/${BUILDTYPE}/lib.target/libmapbox-gl.so android/java/lib/src/main/jniLibs/${JNIDIR}/libmapbox-gl.so
+cp build/android/${MASON_ANDROID_ABI}/out/${BUILDTYPE}/lib.target/libmapbox-gl.so android/java/lib/src/main/jniLibs/${JNIDIR}/libmapbox-gl.so
 mkdir -p android/java/lib/src/main/assets
-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
+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