Use a single cros_toolchain tarball for ChromeOS build

platform_tools/chromeos/bin/chromeos_make

Index: platform_tools/chromeos/bin/chromeos_make
diff --git a/platform_tools/chromeos/bin/chromeos_make b/platform_tools/chromeos/bin/chromeos_make
index 8f4230dd805ed3377703200c2dfc028a724da8b7..ecec82c91bbcb6568f4538213ad27280dd5ee133 100755
--- a/platform_tools/chromeos/bin/chromeos_make
+++ b/platform_tools/chromeos/bin/chromeos_make
@@ -14,7 +14,6 @@ fi
 
 makeVars=""
 deviceID=""
-crosBotoFile=""
 
 while (( "$#" )); do
 
@@ -22,10 +21,6 @@ while (( "$#" )); do
   then 
     deviceID="$2"
     shift
-  elif [[ "$1" == "--cros-boto-file" ]];
-  then
-    crosBotoFile="$2"
-    shift
   else
     makeVars="$makeVars $1"
   fi
@@ -40,29 +35,6 @@ fi
 
 CHROMEOS_CHROOT="${SCRIPT_DIR}/../toolchain"
 
-# Obtain some extra headers and libraries if needed.

[borenet, 2013/06/21 20:22:32]

These have been merged into a single tarball.

-if ! [[ -d "${CHROMEOS_CHROOT}/x86-generic" && \
-        -d "${CHROMEOS_CHROOT}/amd64-generic" && \
-        -d "${CHROMEOS_CHROOT}/arm-generic" ]]; then
-  gsutil cp gs://chromium-skia-gm/chromeos-toolchains/cros_toolchain.tgz ${CHROMEOS_CHROOT}
-  if [[ "$?" != "0" ]]; then
-    exit 1
-  fi
-  pushd ${CHROMEOS_CHROOT} > /dev/null
-  tar -zxvf cros_toolchain.tgz
-  if [[ "$?" != "0" ]]; then
-    exit 1
-  fi
-  rm cros_toolchain.tgz
-  popd > /dev/null
-fi
-
-# If a boto file was provided, use that instead of the default.
-if [[ -n "$crosBotoFile" ]]; then
-  export AWS_CREDENTIAL_FILE="$crosBotoFile"
-  export BOTO_CONFIG="$crosBotoFile"
-fi
-
 # Get the required SDK version.
 # TODO(borenet): Should we instead get the latest from GS?
 #SDK_VERSION=$(gsutil cat gs://chromeos-image-archive/${deviceID}-release/LATEST-master)
@@ -71,6 +43,22 @@ SDK_VERSION="4279.0.0"
 mkdir -p "${CHROMEOS_CHROOT}/src/chromeos"
 echo -n ${SDK_VERSION} > "${CHROMEOS_CHROOT}/src/chromeos/CHROMEOS_LKGM"
 
+# Download the toolchain tarball if needed.
+# TODO(borenet): Let chrome-sdk take care of this once it works with external
+# boards.
+if ! [[ -d "${CHROMEOS_CHROOT}/.cros_cache" ]]; then

[djsollen, 2013/06/24 18:46:52]

is that dir always in the chroot?

[borenet, 2013/06/24 18:48:51]

That's where the chrome-sdk tool stores everything it downloads.  The chroot
itself is actually inside that directory.

+  TARBALL="cros_toolchain.tgz"
+  gsutil cp gs://chromium-skia-gm/chromeos-toolchains/${TARBALL} ${CHROMEOS_CHROOT}
+  if [ "$?" != "0" ]
+  then
+    exit 1;
+  fi
+  pushd "${CHROMEOS_CHROOT}" > /dev/null
+  tar -zxvf ${TARBALL}
+  popd > /dev/null
+  rm ${CHROMEOS_CHROOT}/${TARBALL}
+fi
+
 # Put a fake .gclient file in the toolchain directory so that the cros tool
 # thinks we're in a Chrome checkout.
 echo "Delete me!" > "${CHROMEOS_CHROOT}/.gclient"