diff --git a/.travis.yml b/.travis.yml index 3c4d76652..952405ea0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,7 +28,8 @@ before_install: - source ./scripts/local_mason.sh - source ./scripts/travis_helper.sh - source ./scripts/flags.sh -- source ./scripts/travis_before_install.sh +- export ANDROID_NDK_PATH="$(pwd)/android-ndk-r10c" +- ./scripts/travis_before_install.sh - if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then export LD_LIBRARY_PATH=`mason prefix mesa 10.3.1`/lib; fi - if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then glxinfo; fi diff --git a/scripts/travis_before_install.sh b/scripts/travis_before_install.sh index 1e9d581ed..be8125221 100755 --- a/scripts/travis_before_install.sh +++ b/scripts/travis_before_install.sh @@ -21,11 +21,6 @@ if [[ "${MASON_PLATFORM}" == "android" ]]; then echo "debug: upacking NDK" #mapbox_time "unpacking NDK" \ $SEVEN_ZIP_PATH x ./android-ndk-r10c-linux-x86_64.bin > /dev/null - - echo "debug: setting ANDROID_NDK_PATH" - #export ANDROID_NDK_PATH=$(pwd)/android-ndk-r10c - - echo "debug: $ANDROID_NDK_PATH" fi if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then