Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(138)

Unified Diff: platform_tools/android/bin/android_setup.sh

Issue 22929006: default to device type of last build if no device type is given (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: addressing comments Created 7 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: platform_tools/android/bin/android_setup.sh
diff --git a/platform_tools/android/bin/android_setup.sh b/platform_tools/android/bin/android_setup.sh
index fc3b6699f9d888007ddc77afd697af1100b366a4..e18008e7544f2801764b2cd11765805ad50ced5c 100755
--- a/platform_tools/android/bin/android_setup.sh
+++ b/platform_tools/android/bin/android_setup.sh
@@ -160,9 +160,15 @@ setup_device() {
# Setup the build variation depending on the target device
TARGET_DEVICE="$1"
+
if [ -z "$TARGET_DEVICE" ]; then
- echo "INFO: no target device type was specified so using the default 'arm_v7'"
- TARGET_DEVICE="arm_v7"
+ if [ -f .android_config ]; then
+ TARGET_DEVICE=$(cat .android_config)
+ echo "INFO: no target device was specified so using the device (${TARGET_DEVICE}) from the most recent build"
+ else
+ TARGET_DEVICE="arm_v7"
+ echo "INFO: no target device type was specified so using the default '${TARGET_DEVICE}'"
+ fi
fi
case $TARGET_DEVICE in

Powered by Google App Engine
This is Rietveld 408576698