commit 7ae68a8f8d5b26cb945dbf8147eb343a59c22b40
author borenet <borenet@google.com> Thu May 14 06:37:23 2015 -0700
committer Commit bot <commit-bot@chromium.org> Thu May 14 06:37:23 2015 -0700
tree a32811d6a1e0da108884b76677fdc95717ddd6db
parent 35786b176c159d2e7a816e9da9b051ef3129d5cb

Android scripts: add --verbose, fix missing 'source android_setup'

BUG=skia:3836
TBR=djsollen

Review URL: https://codereview.chromium.org/1145473002

platform_tools/android/bin/android_kill_skia

diff --git a/platform_tools/android/bin/android_kill_skia b/platform_tools/android/bin/android_kill_skia
index f1bbef6..09866b7 100755
--- a/platform_tools/android/bin/android_kill_skia
+++ b/platform_tools/android/bin/android_kill_skia
@@ -4,6 +4,7 @@
 
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
+source $SCRIPT_DIR/android_setup.sh
 source $SCRIPT_DIR/utils/setup_adb.sh
 
 if [ $(uname) == "Linux" ]; then

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 73fac9a..f1db3b5 100755
--- a/platform_tools/android/bin/android_setup.sh
+++ b/platform_tools/android/bin/android_setup.sh
@@ -33,6 +33,8 @@
     USE_CLANG="true"
   elif [[ "$1" == "--logcat" ]]; then
     LOGCAT=1
+  elif [[ "$1" == "--verbose" ]]; then
+    set -x
   else
     APP_ARGS=("${APP_ARGS[@]}" "${1}")
   fi