diff --git a/.travis.yml b/.travis.yml
index 9bd2f98f5e22c..113994f5248ac 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,4 @@
-language: dart
+language: cpp
 sudo: required
 before_install:
   - ./travis/before_install.sh
diff --git a/sky/tools/gn b/sky/tools/gn
index 1fe6328f35b75..8a2c98c399faa 100755
--- a/sky/tools/gn
+++ b/sky/tools/gn
@@ -29,7 +29,7 @@ def to_gn_args(args):
     gn_args = {}
 
     gn_args["is_debug"] = args.debug
-    gn_args["is_clang"] = args.target_os not in ['android']
+    gn_args["is_clang"] = args.clang and args.target_os not in ['android']
 
     if args.target_os == 'android':
         gn_args["target_os"] = "android"
@@ -79,6 +79,9 @@ def main():
   parser.add_argument('--goma', default=True, action='store_true')
   parser.add_argument('--no-goma', dest='goma', action='store_false')
 
+  parser.add_argument('--clang', default=True, action='store_true')
+  parser.add_argument('--no-clang', dest='clang', action='store_false')
+
   args = parser.parse_args()
 
   command = ['gn', 'gen', '--check']
diff --git a/travis/build.sh b/travis/build.sh
index 329db0bb6ee92..bb1dbd3efb2e9 100755
--- a/travis/build.sh
+++ b/travis/build.sh
@@ -3,5 +3,5 @@ set -ex
 
 # Linux Debug
 ./sky/tools/gn --debug
-ninja -j 8 -C out/Debug
-./sky/tools/test_sky --debug
+ninja -j 2 -C out/Debug
+./sky/tools/test_sky --debug --child-processes=1
diff --git a/travis/gclient b/travis/gclient
index 1bad4d8676935..d5b7958e75f7e 100644
--- a/travis/gclient
+++ b/travis/gclient
@@ -5,4 +5,4 @@ solutions = [{
   "managed"     : False,
   "safesync_url": "",
 }]
-target_os = ['linux']
+target_os = ['linux', 'android']