From f2776c0854067e31391bff129bcfe9e7fbd72cf1 Mon Sep 17 00:00:00 2001 From: Leith Bade Date: Sat, 6 Dec 2014 15:31:37 +1100 Subject: [PATCH] Try NDK install via git clone --- .gitmodules | 3 +++ android-ndk | 1 + scripts/travis_before_install.sh | 16 ---------------- 3 files changed, 4 insertions(+), 16 deletions(-) create mode 160000 android-ndk diff --git a/.gitmodules b/.gitmodules index 588802377..dc490184f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -13,3 +13,6 @@ [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/android-ndk b/android-ndk new file mode 160000 index 000000000..e32ad08df --- /dev/null +++ b/android-ndk @@ -0,0 +1 @@ +Subproject commit e32ad08df1058ec611c771eb1dad234eb886a1b6 diff --git a/scripts/travis_before_install.sh b/scripts/travis_before_install.sh index cff998c7b..3693be33a 100755 --- a/scripts/travis_before_install.sh +++ b/scripts/travis_before_install.sh @@ -11,22 +11,6 @@ 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