diff options
| author | Leith Bade <leith@mapbox.com> | 2015-01-29 10:38:53 +1100 |
|---|---|---|
| committer | Leith Bade <leith@mapbox.com> | 2015-01-29 10:38:53 +1100 |
| commit | 883a6dc32bed8db9b78676657732189399fde6d2 (patch) | |
| tree | 745660ecf7fd6bf70fabe150e09cdeacad7a8542 /Makefile | |
| parent | 2e596151e4480927b60f04da8c9abc107fc81485 (diff) | |
| download | qtlocation-mapboxgl-883a6dc32bed8db9b78676657732189399fde6d2.tar.gz | |
Use seperate build dir for each ABI
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -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 |