diff options
| author |  djsollen <djsollen@google.com> | 2015-06-10 12:37:56 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-06-10 12:37:56 -0700 |
| commit | 46409de6abb1a41f13081a3460ad95b370b6b04b (patch) | |
| tree | 1144bb1559d03af02082d7c5625dfe92e6b945ee /platform_tools | |
| parent | 1a1b3ac0d4feecb0fefa8a07c7abf3471c96f545 (diff) | |
Remove verbose bash logging
Review URL: https://codereview.chromium.org/1170283004
Diffstat (limited to 'platform_tools')
| -rwxr-xr-x | platform_tools/android/bin/android_run_skia | 9 | ||||
| -rwxr-xr-x | platform_tools/android/bin/android_setup.sh | 3 |
2 files changed, 10 insertions, 2 deletions
diff --git a/platform_tools/android/bin/android_run_skia b/platform_tools/android/bin/android_run_skia index 016bd79059..bbb9325901 100755 --- a/platform_tools/android/bin/android_run_skia +++ b/platform_tools/android/bin/android_run_skia @@ -13,6 +13,7 @@ then exit 1 fi +verbose "pushing binaries onto the device..." adb_push_if_needed "${SKIA_OUT}/$BUILDTYPE/skia_launcher" /data/local/tmp if [ -f "${SKIA_OUT}/$BUILDTYPE/lib/libskia_android.so" ]; then # Does not exist for builds with static skia. @@ -20,18 +21,24 @@ if [ -f "${SKIA_OUT}/$BUILDTYPE/lib/libskia_android.so" ]; then fi adb_push_if_needed "${SKIA_OUT}/$BUILDTYPE/lib/lib${APP_ARGS[0]}.so" /data/local/tmp if [[ -n $RESOURCE_PATH ]]; then + verbose "pushing resources onto the device..." adb_push_if_needed "${SKIA_SRC_DIR}/resources" $RESOURCE_PATH fi -if [ $LOGCAT ]; then $ADB $DEVICE_SERIAL logcat -c; fi +if [ $LOGCAT ]; then + verbose "clearing the device logs..." + $ADB $DEVICE_SERIAL logcat -c; +fi STATUS_FILENAME="/data/local/tmp/.skia_tmp_$(date +%s%N)" CMD_FILENAME=".skia_cmd_tmp_$(date +%s%N)" echo "LD_LIBRARY_PATH=/data/local/tmp:$LD_LIBRARY_PATH \ /data/local/tmp/skia_launcher ${APP_ARGS[*]}; \ echo \$? > ${STATUS_FILENAME}" > ${CMD_FILENAME} chmod +x ${CMD_FILENAME} +verbose "pushing command file onto the device..." $ADB ${DEVICE_SERIAL} push ${CMD_FILENAME} /data/local/tmp rm ${CMD_FILENAME} +verbose "preparing to run ${APP_ARGS[0]} on the device..." $ADB ${DEVICE_SERIAL} shell sh /data/local/tmp/${CMD_FILENAME} if [ -z "$($ADB $DEVICE_SERIAL shell 'if [ -f $STATUS_FILENAME ]; then echo exists; fi')" ]; then diff --git a/platform_tools/android/bin/android_setup.sh b/platform_tools/android/bin/android_setup.sh index f1db3b57a8..c557adc447 100755 --- a/platform_tools/android/bin/android_setup.sh +++ b/platform_tools/android/bin/android_setup.sh @@ -34,7 +34,8 @@ while (( "$#" )); do elif [[ "$1" == "--logcat" ]]; then LOGCAT=1 elif [[ "$1" == "--verbose" ]]; then - set -x + VERBOSE="true" + APP_ARGS=("${APP_ARGS[@]}" "${1}") else APP_ARGS=("${APP_ARGS[@]}" "${1}") fi |