From 6fecb80405944edeb87cfda4ccc6ccbe685c842c Mon Sep 17 00:00:00 2001
From: Leith Bade <leith@mapbox.com>
Date: Tue, 9 Dec 2014 22:44:12 +1100
Subject: [PATCH] Go back to 7z NDK

---
 .gitmodules                      |  3 ---
 .travis.yml                      |  4 ++--
 scripts/travis_before_install.sh | 16 ++++++++++++++++
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index dc490184f..588802377 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 1b8c11a0f..bdb2cfd20 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 5aaf5f8b8..ff1319d0b 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