Use testmunk from EC2

android/scripts/build-release.sh

@@ -4,5 +4,6 @@ set -e
 set -o pipefail
 
 export BUILDTYPE=Release
+export TESTMUNK=yes
 
 ./android/scripts/common.sh $1

android/scripts/common.sh

@@ -14,7 +14,11 @@ 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
 
-make android BUILDTYPE=$BUILDTYPE
+make android 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
+
+if [[ $TESTMUNK == "yes" ]]; then
+    ./android/scipts/upload-testmunk.sh ./android/java/app/build/outputs/apk/app-debug.apk
+fi

scripts/travis_script.sh

@@ -7,16 +7,8 @@ mapbox_time "checkout_styles" \
 git submodule update --init styles
 
 if [[ $MASON_PLATFORM == "android" ]]; then
-    #mapbox_time "compile_program" \
-    #make android BUILDTYPE=${BUILDTYPE}
     ./android/scripts/run-build.sh
 
-    #if [[ $TESTMUNK == "yes" ]]; then
-        #mapbox_time_start "upload_testmunk"
-        #(cd ./android/test/ && ./upload_testmunk.sh ../java/app/build/outputs/apk/app-debug.apk)
-        #mapbox_time_finish
-    #fi
-
 elif [[ ${TRAVIS_OS_NAME} == "linux" ]]; then
     #
     # build & test Linux