Revert "Cache Android NDK, tools and platform tools on Travis CI."

This reverts commit b7073f4177cf87859b1d45950c5afca9f0b16ced.

.travis.yml

@@ -3,9 +3,8 @@ cache:
   directories:
     - $HOME/kcov-i686-unknown-linux-gnu
     - $HOME/kcov-x86_64-unknown-linux-gnu
-    - $HOME/android/android-ndk
-    - $HOME/android/android-sdk-linux/platform-tools
-    - $HOME/android/android-sdk-linux/tools
+    - $HOME/android/android-sdk-linux
+    - $HOME/android/android-18-arm-linux-androideabi-4.8
 matrix:
   fast_finish: true
   allow_failures:

mk/travis-install-android.sh

@@ -28,24 +28,20 @@ ANDROID_NDK_VERSION=${ANDROID_NDK_VERSION:-14}
 ANDROID_NDK_URL=https://dl.google.com/android/repository/android-ndk-r${ANDROID_NDK_VERSION}-linux-x86_64.zip
 
 ANDROID_INSTALL_PREFIX="${HOME}/android"
-ANDROID_SDK_INSTALL_DIR="${ANDROID_INSTALL_PREFIX}/android-sdk-linux"
-ANDROID_NDK_INSTALL_DIR="${ANDROID_INSTALL_PREFIX}/android-ndk"
-
-ANDROID_PKGS="android-18,android-18,sys-img-armeabiv7a-android-18"
-
-mkdir -p "${ANDROID_INSTALL_PREFIX}"
-pushd "${ANDROID_INSTALL_PREFIX}"
+ANDROID_SDK_INSTALL_DIR="${HOME}/android/android-sdk-linux"
+ANDROID_NDK_INSTALL_DIR="${ANDROID_INSTALL_PREFIX}/android-18-arm-linux-androideabi-4.8"
 
 if [[ ! -f $ANDROID_SDK_INSTALL_DIR/tools/emulator ]];then
+  mkdir -p "${ANDROID_INSTALL_PREFIX}"
+  pushd "${ANDROID_INSTALL_PREFIX}"
+
   curl ${ANDROID_SDK_URL} | tar -zxf -
 
-  ANDROID_PKGS="tools,platform-tools,${ANDROID_PKGS}"
+  echo y | ./android-sdk-linux/tools/android update sdk -a --no-ui --filter tools,platform-tools,android-18,sys-img-armeabi-v7a-android-18
+
+  popd
 fi
 
-echo y | ./android-sdk-linux/tools/android update sdk -a --no-ui --filter ${ANDROID_PKGS}
-
-popd
-
 if [[ ! -d $ANDROID_NDK_INSTALL_DIR/sysroot/usr/include/arm-linux-androideabi ]];then
   mkdir -p "${ANDROID_INSTALL_PREFIX}/downloads"
   pushd "${ANDROID_INSTALL_PREFIX}/downloads"

mk/travis.sh

@@ -30,7 +30,7 @@ armv7-linux-androideabi)
   # install the android sdk/ndk
   mk/travis-install-android.sh
 
-  export PATH=$HOME/android/android-ndk/bin:$PATH
+  export PATH=$HOME/android/android-18-arm-linux-androideabi-4.8/bin:$PATH
   export PATH=$HOME/android/android-sdk-linux/platform-tools:$PATH
   export PATH=$HOME/android/android-sdk-linux/tools:$PATH
   ;;