diff options
| -rw-r--r-- | .gitmodules | 3 | ||||
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rwxr-xr-x | scripts/travis_before_install.sh | 16 |
3 files changed, 18 insertions, 5 deletions
diff --git a/.gitmodules b/.gitmodules index dc490184f6..588802377e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -13,6 +13,3 @@ [submodule "styles"] path = styles url = https://github.com/mapbox/mapbox-gl-styles.git -[submodule "android-ndk"] - path = android-ndk - url = https://github.com/mapbox/android-ndk.git diff --git a/.travis.yml b/.travis.yml index 1b8c11a0f9..bdb2cfd20d 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" -- export NDK_HOME="$(pwd)/android-ndk" +- export ANDROID_NDK_PATH="$(pwd)/android-ndk-r10c" +- export NDK_HOME="$(pwd)/android-ndk-r10c" - 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 5aaf5f8b85..ff1319d0b4 100755 --- a/scripts/travis_before_install.sh +++ b/scripts/travis_before_install.sh @@ -11,6 +11,22 @@ if [[ "${MASON_PLATFORM}" == "android" ]]; then echo "load submodules" git submodule update --init --recursive + echo "installing 7z" + MASON_PLATFORM= ./.mason/mason install 7z 9.20 + + echo "setting 7z path" + SEVEN_ZIP_PATH="$(MASON_PLATFORM= ./.mason/mason prefix 7z 9.20)/bin/7za" + + echo "fetching NDK" + wget http://dl.google.com/android/ndk/android-ndk-r10c-linux-x86_64.bin + + echo "chmod NDK" + chmod a+x ./android-ndk-r10c-linux-x86_64.bin + + echo "unpacking NDK" + $SEVEN_ZIP_PATH x ./android-ndk-r10c-linux-x86_64.bin > .tmp-ndk-log + rm .tmp-ndk-log + echo "fetching JDK" wget --no-cookies --no-check-certificate --header "Cookie: gpw_e24=http%3A%2F%2Fwww.oracle.com%2F; oraclelicense=accept-securebackup-cookie" http://download.oracle.com/otn-pub/java/jdk/7u71-b14/jdk-7u71-linux-x64.tar.gz |