From 2d2966b7968fd014634d177ca76df43292cb93f9 Mon Sep 17 00:00:00 2001 From: Leith Bade Date: Fri, 7 Aug 2015 10:43:00 +1000 Subject: [PATCH] Build correct Android ABIs on Travis --- scripts/android/run.sh | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/scripts/android/run.sh b/scripts/android/run.sh index 38749f79f..9447bdb7a 100755 --- a/scripts/android/run.sh +++ b/scripts/android/run.sh @@ -3,12 +3,6 @@ set -e set -o pipefail -BUILDTYPE=${BUILDTYPE:-Release} -TESTMUNK=${TESTMUNK:-no} -export HOST=android -export MASON_PLATFORM=android -export MASON_ANDROID_ABI=${ANDROID_ABI:-arm-v7} - # Add Mason to PATH export PATH="`pwd`/.mason:${PATH}" MASON_DIR="`pwd`/.mason" @@ -23,7 +17,7 @@ mkdir -p ./android/java/MapboxGLAndroidSDKTestApp/src/main/res/raw echo "${MAPBOX_ACCESS_TOKEN}" > ./android/java/MapboxGLAndroidSDKTestApp/src/main/res/raw/token.txt mapbox_time "compile_library" \ -make android-lib -j${JOBS} BUILDTYPE=${BUILDTYPE} +make android-lib-${ANDROID_ABI} -j${JOBS} BUILDTYPE=${BUILDTYPE} mapbox_time "build_apk" \ make android -j${JOBS} BUILDTYPE=${BUILDTYPE}