From 91819c6e8c29e50540591b35260027948f339d65 Mon Sep 17 00:00:00 2001
From: Adam Barth <abarth@chromium.org>
Date: Fri, 17 Jul 2015 09:09:51 -0700
Subject: [PATCH] Attempt to make Travis go green

---
 .travis.yml             |  1 +
 CONTRIBUTING.md         |  1 +
 DEPS                    |  6 ------
 build/config/crypto.gni |  2 +-
 sky/tools/roll/roll.py  |  3 ++-
 travis/gclient          |  2 +-
 travis/setup.sh         | 23 ++++++++++++++++-------
 7 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 349c9514d2339..9bd2f98f5e22c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,4 +6,5 @@ before_script:
   - ./travis/setup.sh
   - export PATH=$PWD/depot_tools:$PATH
   - export BOTO_CONFIG=$PWD/boto
+  - cd src
 script: ./travis/build.sh
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index a324f33c07e62..7fbd99ceedcec 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -39,6 +39,7 @@ target.
 ### Android
 
 * (Only the first time) `./build/install-build-deps-android.sh`
+* (Only the first time) `./tools/android/download_android_tools.py`
 * `./sky/tools/gn --android`
 * `ninja -C out/android_Debug`
 * `./sky/tools/shelldb start out/android_Debug/ sky/sdk/example/hello_world/lib/main.dart`
diff --git a/DEPS b/DEPS
index e083b783e2278..0d7fc3f1af425 100644
--- a/DEPS
+++ b/DEPS
@@ -184,12 +184,6 @@ hooks = [
     'pattern': '.',
     'action': ['python', 'src/tools/dart/update.py'],
   },
-  {
-    # This downloads android_tools according to tools/android/VERSION_*.
-    'name': 'android_tools',
-    'pattern': '.',
-    'action': ['python', 'src/tools/android/download_android_tools.py'],
-  },
   {
     # This downloads SDK extras and puts them in the
     # third_party/android_tools/sdk/extras directory on the bots. Developers
diff --git a/build/config/crypto.gni b/build/config/crypto.gni
index 90a45eafee860..2cd72d338cab1 100644
--- a/build/config/crypto.gni
+++ b/build/config/crypto.gni
@@ -26,4 +26,4 @@ use_openssl_certs = is_android
 # True if NSS is used for certificate verification. Note that this is
 # independent from use_openssl. It is possible to use OpenSSL for the crypto
 # library, but NSS for the platform certificate library.
-use_nss_certs = is_linux
+use_nss_certs = false
diff --git a/sky/tools/roll/roll.py b/sky/tools/roll/roll.py
index d974c49f9cfb6..e1bab7925a26d 100755
--- a/sky/tools/roll/roll.py
+++ b/sky/tools/roll/roll.py
@@ -93,6 +93,7 @@
 # The contents of these files before the roll will be preserved after the roll,
 # even though they live in directories rolled in from Chromium.
 files_not_to_roll = [
+    'build/config/crypto.gni',
     'build/config/ui.gni',
     'build/ls.py',
     'build/module_args/mojo.gni',
@@ -145,7 +146,7 @@ def main():
 
   if args.chromium_dir:
       rev(args.chromium_dir, args.dest_dir, dirs_from_chromium, 'chromium')
-    
+
       try:
           patch.patch_and_filter(args.dest_dir)
       except subprocess.CalledProcessError:
diff --git a/travis/gclient b/travis/gclient
index 1dd35eca64d38..1bad4d8676935 100644
--- a/travis/gclient
+++ b/travis/gclient
@@ -5,4 +5,4 @@ solutions = [{
   "managed"     : False,
   "safesync_url": "",
 }]
-target_os = ['android', 'linux']
+target_os = ['linux']
diff --git a/travis/setup.sh b/travis/setup.sh
index 04293a2956b6d..367d9f26c3324 100755
--- a/travis/setup.sh
+++ b/travis/setup.sh
@@ -1,20 +1,29 @@
 #!/bin/bash
 set -ex
 
+# Create an src/ directory to work with.
+# TODO(alhaad): This is a temporary hack. Find a better way to do this.
+mkdir ../src
+mv * ../src
+mv .??* ../src
+mv ../src .
+
 # Get depot_tools.
 git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git
 export PATH="$(pwd)/depot_tools:${PATH}"
 
+# Get dependencies.
+sudo apt-get install libdbus-1-dev libgconf2-dev bison gperf wdiff python-openssl
+sudo easy_install pip
+sudo pip install requests
+
 # Get gsutil
 rm -f gsutil.tar.gz
 wget https://storage.googleapis.com/pub/gsutil.tar.gz
 tar xzf gsutil.tar.gz
 
-# Get dependencies.
-sudo apt-get install libdbus-1-dev
-sudo apt-get install libgconf2-dev
-sudo apt-get install python-openssl
-sudo easy_install pip
-sudo pip install requests
+# Setup .gclient file.
+cp src/travis/gclient .gclient
 
-gclient sync --gclientfile=travis/gclient
+cd src
+gclient sync