diff options
| -rw-r--r-- | .travis.yml | 5 | ||||
| -rwxr-xr-x | scripts/travis_before_install.sh | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index 9cef28fd00..817dc77fcc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -48,7 +48,6 @@ env: before_install: - sudo service mysql stop - sudo service postgresql stop -- sudo ps aux - source ./scripts/local_mason.sh - source ./scripts/travis_helper.sh - source ./scripts/flags.sh @@ -57,8 +56,8 @@ before_install: - 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 -- if [[ ${TRAVIS_OS_NAME} == "linux" && ${MASON_PLATFORM} != "android"]]; then export LD_LIBRARY_PATH=`mason prefix mesa 10.3.1`/lib; fi -- if [[ ${TRAVIS_OS_NAME} == "linux" && ${MASON_PLATFORM} != "android"]]; then glxinfo; fi +- if [[ ${TRAVIS_OS_NAME} == "linux" && ${MASON_PLATFORM} != "android" ]]; then export LD_LIBRARY_PATH=`mason prefix mesa 10.3.1`/lib; fi +- if [[ ${TRAVIS_OS_NAME} == "linux" && ${MASON_PLATFORM} != "android" ]]; then glxinfo; fi install: - make config.gypi diff --git a/scripts/travis_before_install.sh b/scripts/travis_before_install.sh index 3d7150d7cd..092f68c7fb 100755 --- a/scripts/travis_before_install.sh +++ b/scripts/travis_before_install.sh @@ -62,6 +62,8 @@ if [[ "${MASON_PLATFORM}" == "android" ]]; then echo "chmod NDK" chmod a+x ./android-ndk-r10c-darwin-x86_64.bin + sudo ps aux + echo "unpacking NDK" $SEVEN_ZIP_PATH x ./android-ndk-r10c-darwin-x86_64.bin > .tmp-ndk-log rm .tmp-ndk-log |