platform_tools/android/bin/android_run_skia - Issue 22812003: Make android_run_skia exit with the correct code

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 22812003: Make android_run_skia exit with the correct code (Closed) Base URL: http://skia.googlecode.com/svn/trunk/

Patch Set: Created 7 years, 4 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 | Annotate | Revision Log

« no previous file with comments | « no previous file | no next file » | no next file with comments »

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 source $SCRIPT_DIR/android_setup.sh	7 source $SCRIPT_DIR/android_setup.sh

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

9	9

10 configuration="Debug"	10 configuration="Debug"

(...skipping 15 matching lines...) Expand all Loading...
26 echo "Unable to find the ${runVars[0]} library"	26 echo "Unable to find the ${runVars[0]} library"

27 exit 1	27 exit 1

28 fi	28 fi

29	29

30 adb_push_if_needed "${SKIA_OUT}/${configuration}/skia_launcher" /data/local/tmp	30 adb_push_if_needed "${SKIA_OUT}/${configuration}/skia_launcher" /data/local/tmp

31 adb_push_if_needed "${SKIA_OUT}/${configuration}/lib.target/libskia_android.so" /data/local/tmp	31 adb_push_if_needed "${SKIA_OUT}/${configuration}/lib.target/libskia_android.so" /data/local/tmp

32 adb_push_if_needed "${SKIA_OUT}/${configuration}/lib.target/lib${runVars[0]}.so" /data/local/tmp	32 adb_push_if_needed "${SKIA_OUT}/${configuration}/lib.target/lib${runVars[0]}.so" /data/local/tmp

33	33

34	34

35 $ADB ${DEVICE_SERIAL} shell /data/local/tmp/skia_launcher ${runVars[@]}	35 $ADB ${DEVICE_SERIAL} shell /data/local/tmp/skia_launcher ${runVars[@]}

	36 exit $?

OLD	NEW