diff options
author | Dane Springmeyer <dane@mapbox.com> | 2014-11-01 22:55:18 -0400 |
---|---|---|
committer | Dane Springmeyer <dane@mapbox.com> | 2014-11-01 22:55:18 -0400 |
commit | fbd71f69291383452ce667b15314ac913eb9150b (patch) | |
tree | 68076d680e3e47afc444d7b409453a7a0370600c /.travis.yml | |
parent | 969ef9a663b3502c8f6ffb8063d6f52cf19b8f53 (diff) | |
download | qtlocation-mapboxgl-fbd71f69291383452ce667b15314ac913eb9150b.tar.gz |
fix path to mason
Diffstat (limited to '.travis.yml')
-rw-r--r-- | .travis.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index 905bc4a661..6681932aad 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,8 +25,8 @@ env: - LD_LIBRARY_PATH: '/usr/local/lib' before_install: -- if [ "${MASON_PLATFORM}" = "android" ]; then MASON_PLATFORM= ~/.mason/mason install 7z 9.20; export PATH=$(MASON_PLATFORM= ~/.mason/mason prefix 7z 9.20)/bin:${PATH}; wget http://dl.google.com/android/ndk/android-ndk-r10c-linux-x86_64.bin; chmod a+x ./android-ndk-r10c-linux-x86_64.bin; 7za x ./android-ndk-r10c-linux-x86_64.bin > /dev/null; export ANDROID_NDK_PATH=$(pwd)/android-ndk-r10c; ls -l;ls -l $ANDROID_NDK_PATH; fi; - source ./scripts/local_mason.sh +- if [ "${MASON_PLATFORM}" = "android" ]; then MASON_PLATFORM= ./.mason/mason install 7z 9.20; export PATH=$(MASON_PLATFORM= ./.mason/mason prefix 7z 9.20)/bin:${PATH}; wget http://dl.google.com/android/ndk/android-ndk-r10c-linux-x86_64.bin; chmod a+x ./android-ndk-r10c-linux-x86_64.bin; 7za x ./android-ndk-r10c-linux-x86_64.bin > /dev/null; export ANDROID_NDK_PATH=$(pwd)/android-ndk-r10c; ls -l;ls -l $ANDROID_NDK_PATH; fi; - source ./scripts/travis_helper.sh - source ./scripts/flags.sh - ./scripts/travis_before_install.sh |