From 5f4a2a66c76982c34d200916367eb760425ebbfa Mon Sep 17 00:00:00 2001 From: Brad Leege Date: Wed, 11 Mar 2015 14:32:23 -0500 Subject: [PATCH 1/2] #978 - Changing `gradle build` to `gradle assembleRelease` for `make android` --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index e61533a5d..ff05884c9 100644 --- a/Makefile +++ b/Makefile @@ -173,11 +173,11 @@ android-lib: android-lib-$(ANDROID_ABI) # Builds the selected/default Android library android: android-lib-$(ANDROID_ABI) - cd android/java && ./gradlew --parallel-threads=$(JOBS) build + cd android/java && ./gradlew --parallel-threads=$(JOBS) assembleRelease # Builds all android architectures. android-all: $(ANDROID_ABIS) - cd android/java && ./gradlew --parallel-threads=$(JOBS) build + cd android/java && ./gradlew --parallel-threads=$(JOBS) assembleRelease # Full build of GL Core for each architecture, build the Android Library, publish to Maven Central android-deploy: $(ANDROID_ABIS) From fceb36c7412ebb3c4175236b88e5782edca1b32c Mon Sep 17 00:00:00 2001 From: Brad Leege Date: Wed, 11 Mar 2015 15:08:41 -0500 Subject: [PATCH 2/2] #978 - Creating `android-project` task as an alias for `android-lib` to mirror `iproj` functionality --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index ff05884c9..9ec88ec6c 100644 --- a/Makefile +++ b/Makefile @@ -183,6 +183,7 @@ android-all: $(ANDROID_ABIS) android-deploy: $(ANDROID_ABIS) cd android/java/MapboxGLAndroidSDK && chmod ugo+x deploy.sh && ./deploy.sh +android-project: android-lib ##### Render builds ############################################################