Fix android_run_skia to work with multiple attached devices
(SkipBuildbotRuns)
R=djsollen@google.com
Review URL: https://codereview.chromium.org/15199005
git-svn-id: http://skia.googlecode.com/svn/trunk@9167 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/platform_tools/android/bin/android_kill_skia b/platform_tools/android/bin/android_kill_skia
index 5560efc..a17f88d 100755
--- a/platform_tools/android/bin/android_kill_skia
+++ b/platform_tools/android/bin/android_kill_skia
@@ -6,11 +6,28 @@
source $SCRIPT_DIR/utils/setup_adb.sh
+SERIAL=""
+
+while (( "$#" )); do
+
+ if [[ "$1" == "-s" ]];
+ then
+ if [[ $# -lt 2 ]];
+ then
+ echo "ERROR: missing serial number"
+ exit 1;
+ fi
+ SERIAL="-s $2"
+ shift
+ fi
+ shift
+done
+
if [ $(uname) == "Linux" ]; then
- $ADB shell ps | grep skia | awk '{print $2}' | xargs -r $ADB shell kill
+ $ADB $SERIAL shell ps | grep skia | awk '{print $2}' | xargs -r $ADB $SERIAL shell kill
elif [ $(uname) == "Darwin" ]; then
- $ADB shell ps | grep skia | awk '{print $2}' | xargs $ADB shell kill
+ $ADB $SERIAL shell ps | grep skia | awk '{print $2}' | xargs $ADB $SERIAL shell kill
else
echo "Could not automatically determine OS!"
exit 1;
-fi
+fi
\ No newline at end of file
diff --git a/platform_tools/android/bin/android_run_skia b/platform_tools/android/bin/android_run_skia
index f958b76..00fe37f 100755
--- a/platform_tools/android/bin/android_run_skia
+++ b/platform_tools/android/bin/android_run_skia
@@ -35,13 +35,13 @@
if [[ "$USE_INTENT" == "true" ]];
then
- $ADB logcat -c
+ $ADB $SERIAL logcat -c
$ADB $SERIAL shell am broadcast -a com.skia.intent.action.LAUNCH_SKIA -n com.skia/.SkiaReceiver -e args "$APP_ARGS"
trap "echo \"Interrupt.\"" INT
- eval "($ADB logcat)"
+ eval "($ADB $SERIAL logcat)"
trap - INT
echo "Interrupt. Killing Skia process..."
- $SCRIPT_DIR/android_kill_skia
+ $SCRIPT_DIR/android_kill_skia $SERIAL
echo "Done."
else
$ADB $SERIAL shell skia_launcher $APP_ARGS