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

Side by Side Diff: platform_tools/android/bin/android_setup.sh

Issue 870643002: android_run_skia: dump logcat on failure (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: --logcat Created 5 years, 11 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 unified diff | Download patch
« no previous file with comments | « platform_tools/android/bin/android_run_skia ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 #!/bin/bash 1 #!/bin/bash
2 # 2 #
3 # android_setup.sh: Sets environment variables used by other Android scripts. 3 # android_setup.sh: Sets environment variables used by other Android scripts.
4 4
5 # Fail-fast if anything in the script fails. 5 # Fail-fast if anything in the script fails.
6 set -e 6 set -e
7 7
8 BUILDTYPE=${BUILDTYPE-Debug} 8 BUILDTYPE=${BUILDTYPE-Debug}
9 9
10 while (( "$#" )); do 10 while (( "$#" )); do
11 if [[ "$1" == "-d" ]]; then 11 if [[ "$1" == "-d" ]]; then
12 DEVICE_ID=$2 12 DEVICE_ID=$2
13 shift 13 shift
14 elif [[ "$1" == "-i" || "$1" == "--resourcePath" ]]; then 14 elif [[ "$1" == "-i" || "$1" == "--resourcePath" ]]; then
15 RESOURCE_PATH=$2 15 RESOURCE_PATH=$2
16 APP_ARGS=("${APP_ARGS[@]}" "${1}" "${2}") 16 APP_ARGS=("${APP_ARGS[@]}" "${1}" "${2}")
17 shift 17 shift
18 elif [[ "$1" == "-s" ]]; then 18 elif [[ "$1" == "-s" ]]; then
19 DEVICE_SERIAL="-s $2" 19 DEVICE_SERIAL="-s $2"
20 shift 20 shift
21 elif [[ "$1" == "-t" ]]; then 21 elif [[ "$1" == "-t" ]]; then
22 BUILDTYPE=$2 22 BUILDTYPE=$2
23 shift 23 shift
24 elif [[ "$1" == "--release" ]]; then 24 elif [[ "$1" == "--release" ]]; then
25 BUILDTYPE=Release 25 BUILDTYPE=Release
26 elif [[ "$1" == "--clang" ]]; then 26 elif [[ "$1" == "--clang" ]]; then
27 USE_CLANG="true" 27 USE_CLANG="true"
28 elif [[ "$1" == "--logcat" ]]; then
29 LOGCAT=1
28 else 30 else
29 APP_ARGS=("${APP_ARGS[@]}" "${1}") 31 APP_ARGS=("${APP_ARGS[@]}" "${1}")
30 fi 32 fi
31 shift 33 shift
32 done 34 done
33 35
34 function verbose { 36 function verbose {
35 if [[ -n $VERBOSE ]]; then 37 if [[ -n $VERBOSE ]]; then
36 echo $@ 38 echo $@
37 fi 39 fi
(...skipping 224 matching lines...) Expand 10 before | Expand all | Expand 10 after
262 adb_push_if_needed $HOST_SRC $ANDROID_DST 264 adb_push_if_needed $HOST_SRC $ANDROID_DST
263 else 265 else
264 echo -n "$ANDROID_DST " 266 echo -n "$ANDROID_DST "
265 $ADB $DEVICE_SERIAL shell mkdir -p "$(dirname "$ANDROID_DST")" 267 $ADB $DEVICE_SERIAL shell mkdir -p "$(dirname "$ANDROID_DST")"
266 $ADB $DEVICE_SERIAL push $HOST_SRC $ANDROID_DST 268 $ADB $DEVICE_SERIAL push $HOST_SRC $ANDROID_DST
267 fi 269 fi
268 fi 270 fi
269 } 271 }
270 272
271 setup_device "${DEVICE_ID}" 273 setup_device "${DEVICE_ID}"
OLDNEW
« no previous file with comments | « platform_tools/android/bin/android_run_skia ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698