diff options
| author |  borenet <borenet@google.com> | 2015-05-14 06:37:23 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-05-14 06:37:23 -0700 |
| commit | 7ae68a8f8d5b26cb945dbf8147eb343a59c22b40 (patch) | |
| tree | a32811d6a1e0da108884b76677fdc95717ddd6db /platform_tools | |
| parent | 35786b176c159d2e7a816e9da9b051ef3129d5cb (diff) | |
Android scripts: add --verbose, fix missing 'source android_setup'
BUG=skia:3836
TBR=djsollen
Review URL: https://codereview.chromium.org/1145473002
Diffstat (limited to 'platform_tools')
| -rwxr-xr-x | platform_tools/android/bin/android_kill_skia | 1 | ||||
| -rwxr-xr-x | platform_tools/android/bin/android_setup.sh | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/platform_tools/android/bin/android_kill_skia b/platform_tools/android/bin/android_kill_skia index f1bbef6ba8..09866b7865 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 diff --git a/platform_tools/android/bin/android_setup.sh b/platform_tools/android/bin/android_setup.sh index 73fac9a468..f1db3b57a8 100755 --- a/platform_tools/android/bin/android_setup.sh +++ b/platform_tools/android/bin/android_setup.sh @@ -33,6 +33,8 @@ while (( "$#" )); do USE_CLANG="true" elif [[ "$1" == "--logcat" ]]; then LOGCAT=1 + elif [[ "$1" == "--verbose" ]]; then + set -x else APP_ARGS=("${APP_ARGS[@]}" "${1}") fi |