summaryrefslogtreecommitdiffstats
path: root/build/install-build-deps-android.sh
diff options
context:
space:
mode:
authorilevy@chromium.org <ilevy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-22 23:58:58 +0000
committerilevy@chromium.org <ilevy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-22 23:58:58 +0000
commit959a0f5c847f494f19efe369ce99e74d517b20f3 (patch)
treeb1470edb7ad010b5d834c91daa5355fbeaab6976 /build/install-build-deps-android.sh
parenta22af40147edc2dfcdbce1ea4d558bea036f5909 (diff)
downloadchromium_src-959a0f5c847f494f19efe369ce99e74d517b20f3.zip
chromium_src-959a0f5c847f494f19efe369ce99e74d517b20f3.tar.gz
chromium_src-959a0f5c847f494f19efe369ce99e74d517b20f3.tar.bz2
Add xvfb dep since we use it in run_tests.sh
- and minor cleanup to script BUG= TEST= Review URL: https://chromiumcodereview.appspot.com/10660003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@143749 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/install-build-deps-android.sh')
-rwxr-xr-xbuild/install-build-deps-android.sh9
1 files changed, 3 insertions, 6 deletions
diff --git a/build/install-build-deps-android.sh b/build/install-build-deps-android.sh
index fb3039c..5d90439 100755
--- a/build/install-build-deps-android.sh
+++ b/build/install-build-deps-android.sh
@@ -38,11 +38,11 @@ sudo apt-get update
# Fix deps
sudo apt-get -f install
-# Install python-pexpect
-sudo apt-get install python-pexpect
+# Install deps
+sudo apt-get -y install python-pexpect ant1.8 xvfb x11-utils
# Install sun-java6 stuff
-sudo apt-get install sun-java6-bin sun-java6-jre sun-java6-jdk
+sudo apt-get -y install sun-java6-bin sun-java6-jre sun-java6-jdk
# Switch version of Java to java-6-sun
# Sun's java is missing certain Java plugins (e.g. for firefox, mozilla). These
@@ -70,7 +70,4 @@ then
fi
fi
-# Install ant 1.8 (default is 1.7).
-sudo apt-get install ant1.8
-
echo "install-build-deps-android.sh complete."