From 435b7cabd399de3e9dea174601b4648f2b58d0aa Mon Sep 17 00:00:00 2001
From: Jeffrey Walton <noloader@gmail.com>
Date: Sun, 9 Dec 2018 04:19:00 -0500
Subject: [PATCH] Update Travis Android SDK and NDK gear

---
 .travis.yml                    | 10 +++++-----
 TestScripts/install-android.sh | 13 ++++++++-----
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index bd7db116..f2bbaadd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,11 +20,11 @@ compiler:
 env:
   global:
     - BUILD_JOBS=2
-    - ANDROID_HOME=$HOME/.android
-    - ANDROID_SDK=$HOME/android/sdk/
-    - ANDROID_NDK=$HOME/android/sdk/ndk-bundle
-    - ANDROID_SDK_ROOT=$ANDROID_SDK
-    - ANDROID_NDK_ROOT=$ANDROID_NDK
+    - ANDROID_HOME="$HOME/.android"
+    - ANDROID_SDK="$HOME/android/sdk/"
+    - ANDROID_NDK="$HOME/android/sdk/ndk-bundle"
+    - ANDROID_SDK_ROOT="$ANDROID_SDK"
+    - ANDROID_NDK_ROOT="$ANDROID_NDK"
 
   matrix:
     - BUILD_MODE="all"
diff --git a/TestScripts/install-android.sh b/TestScripts/install-android.sh
index 09a56c17..e4c9827d 100755
--- a/TestScripts/install-android.sh
+++ b/TestScripts/install-android.sh
@@ -1,17 +1,20 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -e
 
 # install android deps
 sudo apt-get -qq update
 sudo apt-get -qq install --no-install-recommends openjdk-8-jdk unzip
 
+# Required directories
+mkdir =p "$HOME/android"
+mkdir -p "$ANDROID_HOME"
+
 # android skd/ndk
 curl -Lo /tmp/android-sdk.zip https://dl.google.com/android/repository/sdk-tools-linux-3859397.zip
-mkdir $HOME/android
-unzip -qq /tmp/android-sdk.zip -d $HOME/android/sdk/
+unzip -qq /tmp/android-sdk.zip -d "$ANDROID_SDK/"
 rm -f /tmp/android-sdk.zip
-echo y | $HOME/android/sdk/tools/bin/sdkmanager --update > /dev/null
+echo y | "$ANDROID_SDK/tools/bin/sdkmanager" --update > /dev/null
 for package in "ndk-bundle"; do
 	echo install android $package
-	echo y | $HOME/android/sdk/tools/bin/sdkmanager "$package" > /dev/null
+	echo y | "$ANDROID_SDK/tools/bin/sdkmanager" "$package" > /dev/null
 done