From ba058b3affe9d2e7f4a2581bea27f02541a06a3e Mon Sep 17 00:00:00 2001 From: Brad Leege Date: Wed, 11 Feb 2015 13:44:07 -0800 Subject: [PATCH] #826 - Adding make command to build GL core, assemble .aar, and publish to Maven Central --- Makefile | 4 ++++ android/java/MapboxGLAndroidSDK/deploy.sh | 0 styles | 2 +- test/suite | 2 +- 4 files changed, 6 insertions(+), 2 deletions(-) mode change 100644 => 100755 android/java/MapboxGLAndroidSDK/deploy.sh diff --git a/Makefile b/Makefile index ed7c23422..4b4a8ca33 100644 --- a/Makefile +++ b/Makefile @@ -173,6 +173,10 @@ android: android-lib-$(ANDROID_ABI) android-all: $(ANDROID_ABIS) cd android/java && ./gradlew --parallel-threads=$(JOBS) build +# Full build of GL Core for each architecture, build the Android Library, publish to Maven Central +android-deploy: $(ANDROID_ABIS) + cd android/java/MapboxGLAndroidSDK && chmod ugo+x deploy.sh && ./deploy.sh + ##### Maintenace operations #################################################### diff --git a/android/java/MapboxGLAndroidSDK/deploy.sh b/android/java/MapboxGLAndroidSDK/deploy.sh old mode 100644 new mode 100755 diff --git a/styles b/styles index 9b582e2ad..25b1b7dff 160000 --- a/styles +++ b/styles @@ -1 +1 @@ -Subproject commit 9b582e2adc9ed852bf1a9a26b0e10d43389e8618 +Subproject commit 25b1b7dff37a18151e3286144bc8013b432a8860 diff --git a/test/suite b/test/suite index d2fff4e20..dba0f2b1f 160000 --- a/test/suite +++ b/test/suite @@ -1 +1 @@ -Subproject commit d2fff4e2048bc4b0b2eb92c779fce01b4a45b063 +Subproject commit dba0f2b1fa749691435d06a251d733173d41e3f5