diff options
| author | Dane Springmeyer <dane@mapbox.com> | 2014-11-02 15:14:50 -0500 |
|---|---|---|
| committer | Dane Springmeyer <dane@mapbox.com> | 2014-11-02 15:14:50 -0500 |
| commit | 7a45bfa09c0899367625404b2309d670fb333c51 (patch) | |
| tree | 64d24afb7c9ce0b36591af68ee00c71c53773dfe | |
| parent | 3e38fcb7b98c3a4ab7f0674ab707409b3aa30688 (diff) | |
| download | qtlocation-mapboxgl-7a45bfa09c0899367625404b2309d670fb333c51.tar.gz | |
move NDK setup to travis_before_install.sh
| -rw-r--r-- | .travis.yml | 1 | ||||
| -rwxr-xr-x | scripts/travis_before_install.sh | 17 |
2 files changed, 14 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index 5f44a01a01..f2860cdb37 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,7 +26,6 @@ env: before_install: - 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 diff --git a/scripts/travis_before_install.sh b/scripts/travis_before_install.sh index 0a01cbcd90..1d21c1edfd 100755 --- a/scripts/travis_before_install.sh +++ b/scripts/travis_before_install.sh @@ -3,6 +3,17 @@ set -e set -o pipefail +if [[ "${MASON_PLATFORM}" == "android" ]]; then + MASON_PLATFORM= ./.mason/mason install 7z 9.20 + 7Z_PATH=$(MASON_PLATFORM= ./.mason/mason prefix 7z 9.20)/bin/7za + mapbox_time "fetching NDK" \ + wget http://dl.google.com/android/ndk/android-ndk-r10c-linux-x86_64.bin + chmod a+x ./android-ndk-r10c-linux-x86_64.bin + mapbox_time "unpacking NDK" \ + 7Z_PATH x ./android-ndk-r10c-linux-x86_64.bin > /dev/null; + export ANDROID_NDK_PATH=$(pwd)/android-ndk-r10c; +fi + if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then # # install Linux dependencies @@ -32,9 +43,9 @@ if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then llvm-3.4 # required for mesa - unset MASON_PLATFORM - mapbox_time "install_mesa" \ - mason install mesa 10.3.1 + # TODO - figure out how to unset MASON_PLATFORM for just this command + #mapbox_time "install_mesa" \ + MASON_PLATFORM= mason install mesa 10.3.1 mapbox_time "install_awscli" \ sudo pip install awscli |