From 3b3c377b92ac268542a4c2e03433845a81508001 Mon Sep 17 00:00:00 2001
From: Leith Bade <leith@mapbox.com>
Date: Tue, 10 Feb 2015 19:12:17 -0800
Subject: [PATCH] Fix travis after android gradle refactor

---
 android/java/.gitignore       |  2 +-
 android/scripts/common.sh     | 12 ++++++------
 android/scripts/copy-files.sh | 11 -----------
 3 files changed, 7 insertions(+), 18 deletions(-)
 delete mode 100755 android/scripts/copy-files.sh

diff --git a/android/java/.gitignore b/android/java/.gitignore
index ddfa6128e..5f00b1092 100644
--- a/android/java/.gitignore
+++ b/android/java/.gitignore
@@ -11,7 +11,7 @@ build/
 *.apk
 
 # Lib assets
-lib/src/main/assets/
+MapboxGLAndroidSDK/src/main/assets/
 
 # Local settings
 local.properties
diff --git a/android/scripts/common.sh b/android/scripts/common.sh
index 69f41997c..3244ed9d4 100755
--- a/android/scripts/common.sh
+++ b/android/scripts/common.sh
@@ -4,15 +4,15 @@ set -e
 set -o pipefail
 
 NAME=$1
-export JOBS=2
+export JOBS=`nproc`
 
 export CC=clang CXX=clang++
 export MASON_PLATFORM=android
 
-mkdir ./android/java/app/src/main/res/raw/
-echo "${MAPBOX_ACCESS_TOKEN}" >> ./android/java/app/src/main/res/raw/token.txt
+mkdir ./android/java/MapboxGLAndroidSDKTestApp/src/main/res/raw/
+echo "${MAPBOX_ACCESS_TOKEN}" >> ./android/java/MapboxGLAndroidSDKTestApp/src/main/res/raw/token.txt
 
-make android BUILDTYPE=$BUILDTYPE JOBS=$JOBS
+make android -j$JOBS BUILDTYPE=$BUILDTYPE JOBS=$JOBS
 
-aws s3 cp ./android/java/app/build/outputs/apk/app-debug.apk s3://mapbox-gl-testing/android/${NAME}/app-debug.apk
-aws s3 cp ./android/java/app/build/outputs/apk/app-release-unsigned.apk s3://mapbox-gl-testing/android/${NAME}/app-release-unsigned.apk
+aws s3 cp ./android/java/MapboxGLAndroidSDKTestApp/build/outputs/apk/MapboxGLAndroidSDKTestApp-debug.apk s3://mapbox-gl-testing/android/${NAME}/MapboxGLAndroidSDKTestApp-debug.apk
+aws s3 cp ./android/java/MapboxGLAndroidSDKTestApp/build/outputs/apk/MapboxGLAndroidSDKTestApp-release-unsigned.apk s3://mapbox-gl-testing/android/${NAME}/MapboxGLAndroidSDKTestApp-release-unsigned.apk
diff --git a/android/scripts/copy-files.sh b/android/scripts/copy-files.sh
deleted file mode 100755
index 26de6068e..000000000
--- a/android/scripts/copy-files.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-set -o pipefail
-
-mkdir -p android/java/lib/src/main/jniLibs/${JNIDIR}
-cp build/android/${MASON_ANDROID_ABI}/out/${BUILDTYPE}/lib.target/libmapbox-gl.so android/java/lib/src/main/jniLibs/${JNIDIR}/libmapbox-gl.so
-${STRIP} --strip-unneeded android/java/lib/src/main/jniLibs/${JNIDIR}/libmapbox-gl.so
-mkdir -p android/java/lib/src/main/assets
-cp build/android/${MASON_ANDROID_ABI}/out/${BUILDTYPE}/ca-bundle.crt android/java/lib/src/main/assets/ca-bundle.crt
-cp -r build/android/${MASON_ANDROID_ABI}/out/${BUILDTYPE}/styles android/java/lib/src/main/assets/styles