aboutsummaryrefslogtreecommitdiffhomepage
path: root/platform_tools
diff options
context:
space:
mode:
authorGravatar borenet@google.com <borenet@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-06-19 19:44:18 +0000
committerGravatar borenet@google.com <borenet@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-06-19 19:44:18 +0000
commit68b5bae2bc92604b5a48e5a95059960b9d2f6082 (patch)
treec537d5b12152c567f2b49fd8a611591c32441478 /platform_tools
parent6757a3c71fd6c16af6bbd76f268307f0177b17ae (diff)
Allow specification of a non-default boto file in chromeos_make
This is needed because our GS bucket needs a different auth key from the ChromeOS bucket. (SkipBuildbotRuns) R=epoger@google.com Review URL: https://codereview.chromium.org/16975017 git-svn-id: http://skia.googlecode.com/svn/trunk@9692 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'platform_tools')
-rwxr-xr-xplatform_tools/chromeos/bin/chromeos_make11
1 files changed, 11 insertions, 0 deletions
diff --git a/platform_tools/chromeos/bin/chromeos_make b/platform_tools/chromeos/bin/chromeos_make
index ee873b2d4c..8f4230dd80 100755
--- a/platform_tools/chromeos/bin/chromeos_make
+++ b/platform_tools/chromeos/bin/chromeos_make
@@ -14,6 +14,7 @@ fi
makeVars=""
deviceID=""
+crosBotoFile=""
while (( "$#" )); do
@@ -21,6 +22,10 @@ while (( "$#" )); do
then
deviceID="$2"
shift
+ elif [[ "$1" == "--cros-boto-file" ]];
+ then
+ crosBotoFile="$2"
+ shift
else
makeVars="$makeVars $1"
fi
@@ -52,6 +57,12 @@ if ! [[ -d "${CHROMEOS_CHROOT}/x86-generic" && \
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)