From b3a4c1a1164fb753173fea5a014052425065f7b5 Mon Sep 17 00:00:00 2001
From: Matt Blair <blair1618@gmail.com>
Date: Thu, 8 Dec 2016 19:12:54 -0500
Subject: [PATCH] Update CI scripts for new Android build commands

---
 Makefile                                         |  2 +-
 scripts/travis/script_deploy_android_snapshot.sh | 10 +---------
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/Makefile b/Makefile
index 14a823b6d1..2c58994f54 100644
--- a/Makefile
+++ b/Makefile
@@ -207,7 +207,7 @@ android: android-demo
 
 android-sdk:
 	@cd android/ && \
-	./gradlew tangram:assembleDebug
+	./gradlew tangram:assembleFullRelease
 
 android-demo:
 	@cd android/ && \
diff --git a/scripts/travis/script_deploy_android_snapshot.sh b/scripts/travis/script_deploy_android_snapshot.sh
index a0220d59d5..5c63124b66 100755
--- a/scripts/travis/script_deploy_android_snapshot.sh
+++ b/scripts/travis/script_deploy_android_snapshot.sh
@@ -8,16 +8,8 @@ if [ "${PLATFORM}" = "android" ] && [ "${TRAVIS_PULL_REQUEST}" = "false" ] && [
     # Configure private repository credentials (used to sign release artifacts)
     echo -e "machine github.com\n  login $GITHUB_USERNAME\n  password $GITHUB_PASSWORD" >> ~/.netrc
 
-    # Build all android architectures (armeabi-v7a already build)
-    make android-native-lib ANDROID_ARCH=x86
-    make android-native-lib ANDROID_ARCH=armeabi
-    make android-native-lib ANDROID_ARCH=arm64-v8a
-    #### Currently Not building the following architectures
-    #make android-native-lib ANDROID_ARCH=x86_64
-    #make android-native-lib ANDROID_ARCH=mips
-    #make android-native-lib ANDROID_ARCH=mips64
+    make android-sdk
 
-    make android-tangram-apk
     cd "$TRAVIS_BUILD_DIR"/android
     git clone https://github.com/mapzen/android-config.git
     ./gradlew uploadArchives -PsonatypeUsername="$SONATYPE_USERNAME" -PsonatypePassword="$SONATYPE_PASSWORD" -Psigning.keyId="$SIGNING_KEY_ID" -Psigning.password="$SIGNING_PASSWORD" -Psigning.secretKeyRingFile="$SIGNING_SECRET_KEY_RING_FILE"