Modify install script for java/ant based on trying on first upstream bot.

build/install-build-deps-android.sh

Index: build/install-build-deps-android.sh
diff --git a/build/install-build-deps-android.sh b/build/install-build-deps-android.sh
index 8077e8eacba1c1b376a0749443f6aa0f8ea0a163..e6f6a9c6ef7ac4ce491d61fcc452761ab6a43a6a 100755
--- a/build/install-build-deps-android.sh
+++ b/build/install-build-deps-android.sh
@@ -8,12 +8,6 @@
 # requires sudo privileges.
 # See http://code.google.com/p/chromium/wiki/AndroidBuildInstructions
 
-DOWNLOAD_URL="http://ftp.us.debian.org/debian/pool/non-free/s/sun-java6"
-
-BIN_FILE_NAME="sun-java6-bin_6.26-0squeeze1_amd64.deb"
-JRE_FILE_NAME="sun-java6-jre_6.26-0squeeze1_all.deb"
-JDK_FILE_NAME="sun-java6-jdk_6.26-0squeeze1_amd64.deb"
-
 if ! uname -m | egrep -q "i686|x86_64"; then
   echo "Only x86 architectures are currently supported" >&2
   exit
@@ -27,49 +21,19 @@ fi
 
 sudo apt-get update
 
-# The temporary directory used to store the downloaded file.
-TEMPDIR=$(mktemp -d)
-cleanup() {
-  local status=${?}
-  trap - EXIT
-  rm -rf "${TEMPDIR}"
-  exit ${status}
-}
-trap cleanup EXIT
-
-##########################################################
-# Download (i.e. wget) and install debian package.
-# The current directory is changed in this function.
-# Arguments:
-#   file_name
-# Returns:
-#   None
-##########################################################
-install_deb_pkg() {
-  local file_name="${1}"
-  local download_url="${DOWNLOAD_URL}/${file_name}"
+# Fix deps
+sudo apt-get -f install
 
-  cd "${TEMPDIR}"
-  wget "${download_url}"
+# Install python-pexpect
+sudo apt-get install python-pexpect
 
-  echo "Install ${file_name}"
-  sudo dpkg -i "${file_name}"
-}
-
-
-# Install ant
-sudo apt-get install python-pexpect ant
-
-# Install sun-java6-bin
-install_deb_pkg "${BIN_FILE_NAME}"
-
-# Install sun-java6-jre
-install_deb_pkg "${JRE_FILE_NAME}"
-
-# Install sun-java6-jdk
-install_deb_pkg "${JDK_FILE_NAME}"
+# Install sun-java6 stuff
+sudo apt-get install sun-java6-bin sun-java6-jre sun-java6-jdk

[John Grabowski, 2012/03/09 00:06:09]

At the top of this file, mention that TAB <ret> TAB <ret> gets you past the
curses-based dialog that comes up.

[navabi, 2012/03/09 19:40:39]

Done.

 
 # Switch version of Java to java-6-sun
 sudo update-java-alternatives -s java-6-sun

[John Grabowski, 2012/03/09 00:06:09]

Either this (or the one previous?  Not sure) errors out if run on a clean/naked
machine.  Thanks to the -e at the top of the file, this means we never install
ant.  Please fix.

 
+# Install ant
+sudo apt-get install ant
+
 echo "install-build-deps-android.sh complete."