From 81aca5430c840519bd3cce36777af5951b2df402 Mon Sep 17 00:00:00 2001
From: Adam Barth <github@adambarth.com>
Date: Tue, 9 Aug 2016 14:45:03 -0700
Subject: [PATCH] Update Travis to account for buildroot (#2894)

---
 travis/.gitignore | 26 --------------------------
 travis/build.sh   |  6 ++++--
 travis/gclient    |  3 +--
 travis/setup.sh   | 10 +++++-----
 4 files changed, 10 insertions(+), 35 deletions(-)
 delete mode 100644 travis/.gitignore

diff --git a/travis/.gitignore b/travis/.gitignore
deleted file mode 100644
index 59ed186b0..000000000
--- a/travis/.gitignore
+++ /dev/null
@@ -1,26 +0,0 @@
-.idea/
-.vagrant/
-.sconsign.dblite
-.svn/
-
-.DS_Store
-*.swp
-*.lock
-profile
-
-DerivedData/
-build/
-
-*.pbxuser
-*.mode1v3
-*.mode2v3
-*.perspectivev3
-
-!default.pbxuser
-!default.mode1v3
-!default.mode2v3
-!default.perspectivev3
-
-xcuserdata
-
-*.moved-aside
diff --git a/travis/build.sh b/travis/build.sh
index 1ef54e16e..2d8234453 100755
--- a/travis/build.sh
+++ b/travis/build.sh
@@ -3,6 +3,8 @@ set -ex
 
 PATH="$HOME/depot_tools:$PATH"
 
-sky/tools/gn --unoptimized
+cd ..
+
+flutter/tools/gn --unoptimized
 ninja -C out/host_debug_unopt generate_dart_ui
-travis/analyze.sh
+flutter/travis/analyze.sh
diff --git a/travis/gclient b/travis/gclient
index 1cf8dd202..d89fe98de 100644
--- a/travis/gclient
+++ b/travis/gclient
@@ -1,8 +1,7 @@
 solutions = [{
-  "name"        : "src",
+  "name"        : "src/flutter",
   "url"         : "https://github.com/flutter/engine.git",
   "deps_file"   : "DEPS",
   "managed"     : False,
   "safesync_url": "",
 }]
-target_os = ['linux']
diff --git a/travis/setup.sh b/travis/setup.sh
index 8d9419b98..eec7742da 100755
--- a/travis/setup.sh
+++ b/travis/setup.sh
@@ -6,10 +6,10 @@ set -ex
 PATH="$HOME/depot_tools:$PATH"
 
 cd ..
-mv engine src
-mkdir engine
-mv src engine
-cd engine/src
+mv engine flutter
+mkdir src
+mv flutter src
+cd src
 
-mv travis/gclient ../.gclient
+mv flutter/travis/gclient ../.gclient
 gclient sync
-- 
GitLab