From 4f840826606f1f323398ff62ffc2e654669e790b Mon Sep 17 00:00:00 2001 From: Leith Bade Date: Fri, 26 Dec 2014 19:45:40 +1300 Subject: [PATCH] Use two cores --- Makefile | 2 +- android/scripts/common.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index e18118bde..8e85900a5 100644 --- a/Makefile +++ b/Makefile @@ -93,7 +93,7 @@ android: export PATH="`MASON_DIR=./.mason MASON_PLATFORM=android ./.mason/mason env PATH`:${PATH}" && \ MASON_PLATFORM=android ./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 BUILDTYPE=$(BUILDTYPE) V=$(V) androidapp && \ + $(MAKE) -C build/android -j$(JOBS) BUILDTYPE=$(BUILDTYPE) V=$(V) androidapp && \ mkdir -p android/java/lib/src/main/jniLibs/armeabi-v7a && \ cp build/android/out/$(BUILDTYPE)/lib.target/libmapbox-gl.so android/java/lib/src/main/jniLibs/armeabi-v7a/libmapbox-gl.so && \ mkdir -p android/java/lib/src/main/assets && \ diff --git a/android/scripts/common.sh b/android/scripts/common.sh index 9a0c35fb0..7874d1adc 100755 --- a/android/scripts/common.sh +++ b/android/scripts/common.sh @@ -4,7 +4,7 @@ set -e set -o pipefail NAME=$1 - +export JOBS=2 export CC=clang CXX=clang++ export CXXFLAGS="-Wno-unknown-warning-option -Wno-unused-local-typedefs -Wno-unknown-pragmas ${CXXFLAGS}";