platform_tools/android/bin/android_run_skia - Issue 1832883002: Skip toolchain downloads for a few android tools

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: platform_tools/android/bin/android_run_skia

Issue 1832883002: Skip toolchain downloads for a few android tools (Closed) Base URL: https://skia.googlesource.com/skia@master

Patch Set: Address comment Created 4 years, 8 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

OLD	NEW
1 #!/bin/bash	1 #!/bin/bash

2 #	2 #

3 # android_run_skia: starts the correct skia program on the device, prints the	3 # android_run_skia: starts the correct skia program on the device, prints the

4 # output, and kills the app if interrupted.	4 # output, and kills the app if interrupted.

5	5

6 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"	6 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"

	7 SKIP_TOOLCHAIN_SETUP="true"

7 source $SCRIPT_DIR/android_setup.sh	8 source $SCRIPT_DIR/android_setup.sh

8 source $SCRIPT_DIR/utils/setup_adb.sh	9 source $SCRIPT_DIR/utils/setup_adb.sh

9	10

10 if [ ! -f "${SKIA_OUT}/$BUILDTYPE/lib/lib${APP_ARGS[0]}.so" ];	11 if [ ! -f "${SKIA_OUT}/$BUILDTYPE/lib/lib${APP_ARGS[0]}.so" ];

11 then	12 then

12 echo "Unable to find $BUILDTYPE ${APP_ARGS[0]} library"	13 echo "Unable to find $BUILDTYPE ${APP_ARGS[0]} library"

13 exit 1	14 exit 1

14 fi	15 fi

15	16

16 verbose "pushing binaries onto the device..."	17 verbose "pushing binaries onto the device..."

(...skipping 46 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
63 echo "***********************************************************************"	64 echo "***********************************************************************"

64 exit 1	65 exit 1

65 fi	66 fi

66	67

67 echo "EXIT_CODE is ${EXIT_CODE}"	68 echo "EXIT_CODE is ${EXIT_CODE}"

68 if [ $'0\r' != "${EXIT_CODE}" ]; then	69 if [ $'0\r' != "${EXIT_CODE}" ]; then

69 if [ $LOGCAT ]; then $ADB $DEVICE_SERIAL logcat -d; fi	70 if [ $LOGCAT ]; then $ADB $DEVICE_SERIAL logcat -d; fi

70 exit 1	71 exit 1

71 fi	72 fi

72 exit 0	73 exit 0

OLD	NEW

« no previous file with comments | « platform_tools/android/bin/android_kill_skia ('k') | platform_tools/android/bin/android_setup.sh » ('j') | no next file with comments »