From 2967bd85e4133878c9e6997455670b73b2e1696a Mon Sep 17 00:00:00 2001 From: Leith Bade Date: Tue, 9 Dec 2014 22:28:10 +1100 Subject: [PATCH] Fix path to NDK --- .travis.yml | 4 ++-- scripts/travis_before_install.sh | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index bdb2cfd20..1b8c11a0f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -49,8 +49,8 @@ before_install: - source ./scripts/local_mason.sh - source ./scripts/travis_helper.sh - source ./scripts/flags.sh -- export ANDROID_NDK_PATH="$(pwd)/android-ndk-r10c" -- export NDK_HOME="$(pwd)/android-ndk-r10c" +- export ANDROID_NDK_PATH="$(pwd)/android-ndk" +- export NDK_HOME="$(pwd)/android-ndk" - if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then export JAVA_HOME="$(pwd)/jdk1.7.0_71"; fi - export ANDROID_HOME="$(pwd)/android-sdk" - ./scripts/travis_before_install.sh diff --git a/scripts/travis_before_install.sh b/scripts/travis_before_install.sh index 6235c55a3..5aaf5f8b8 100755 --- a/scripts/travis_before_install.sh +++ b/scripts/travis_before_install.sh @@ -31,9 +31,6 @@ if [[ "${MASON_PLATFORM}" == "android" ]]; then echo "inserting access token" sed -i "s/access token goes here/${ANDROID_KEY}/g" android/java/app/src/main/java/com/mapbox/mapboxgl/app/MapFragment.java - - sudo service --status-all - sudo ps -a elif [[ ${TRAVIS_OS_NAME} == "osx" ]]; then