From 6a60d4893ebd744a1855c037ea412fb2c132241a Mon Sep 17 00:00:00 2001
From: Robert Spencer <rspencer@fb.com>
Date: Tue, 28 Feb 2017 00:19:07 -0800
Subject: [PATCH] Add travis_wait to installing Android SDK in travis builds

Summary: The android sdk and api installation seems to be timing out on Travis.  This should extend the 10 minute limit to 20 minutes.  Hopefully this will be enough to download it all.  If not, we must just extend the timeout.

Reviewed By: emilsjolander

Differential Revision: D4588245

fbshipit-source-id: fef25c54b081ba4d96d1e0435c6c1f643ff49b66
---
 .travis.yml | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index dd9d5521..9455dc46 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -56,13 +56,15 @@ before_install:
   # Android
   - |
     if [[ $TARGET = "android" ]]; then
-      brew cask install java &&
-      export JAVA_HOME=$(/usr/libexec/java_home -v 1.8) &&
-      export PATH=$JAVA_HOME/bin:$PATH &&
-      brew install android-sdk &&
-      export ANDROID_SDK=/usr/local/opt/android-sdk &&
-      export ANDROID_HOME=/usr/local/opt/android-sdk
-      $ANDROID_SDK/tools/android update sdk --filter android-19,addon-google_apis-google-19
+      brew cask install java;
+      export JAVA_HOME=$(/usr/libexec/java_home -v 1.8);
+      export PATH=$JAVA_HOME/bin:$PATH;
+      brew install android-sdk;
+      export ANDROID_SDK=/usr/local/Cellar/android-sdk/24.4.1_1;
+      export ANDROID_HOME=/usr/local/Cellar/android-sdk/24.4.1_1;
+      brew install lib32stdc++6 lib32z1;
+      echo y | $ANDROID_SDK/tools/android update sdk --filter android-19,addon-google_apis-google-19,build-tools-19.1.0 --no-ui;
+      echo y | $ANDROID_SDK/tools/android update sdk -u;
     fi
 
   # JavaScript