update alt

Author: Adam Barth

travis/build.sh

@@ -4,9 +4,3 @@ set -ex
 # Linux Debug
 ./sky/tools/gn --debug --no-clang
 ninja -j 8 -C out/Debug
-
-./tools/android/download_android_tools.py
-
-# Android Debug
-./sky/tools/gn --debug --android
-ninja -j 8 -C out/android_Debug

travis/setup.sh

@@ -20,13 +20,17 @@ sudo apt-get install libdbus-1-dev libgconf2-dev bison gperf wdiff python-openss
 sudo easy_install pip
 sudo pip install requests
 
+sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.8 60 --slave /usr/bin/g++ g++ /usr/bin/g++-4.4
+gcc --version
+g++ --version
+
 # Get gsutil
 rm -f gsutil.tar.gz
 wget https://storage.googleapis.com/pub/gsutil.tar.gz
 tar xzf gsutil.tar.gz
 
 # Setup .gclient file.
-cp travis/gclient ../.gclient
+cp src/travis/gclient ../.gclient
 
 cd src
 gclient sync