platform_tools/android/bin/android_launch_app - Issue 2030123002: Fix argument parsing in android app launcher script

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_launch_app

Issue 2030123002: Fix argument parsing in android app launcher script (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: Created 4 years, 6 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 | « no previous file | no next file » | no next file with comments »

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

2 #	2 #

3 # android_launch_app: Launches the skia sampleApp on the device.	3 # android_launch_app: Launches the skia sampleApp on the device.

4	4

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

6 source $SCRIPT_DIR/android_setup.sh	6 source $SCRIPT_DIR/android_setup.sh

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

8	8

9 # TODO: check to ensure that the app exists on the device and prompt to install	9 # TODO: check to ensure that the app exists on the device and prompt to install

10	10

11 if [[ -n $RESOURCE_PATH ]]; then	11 if [[ -n $RESOURCE_PATH ]]; then

12 adb_push_if_needed "${SKIA_SRC_DIR}/resources" $RESOURCE_PATH	12 adb_push_if_needed "${SKIA_SRC_DIR}/resources" $RESOURCE_PATH

13 fi	13 fi

14	14

15 app=${APP_ARGS[0]}	15 app=${APP_ARGS[0]}

16 if [[ ${app} == '-'* ]]; then	16 if [[ ${app} == '-'* ]]; then

17 echo "Defaulting to running SampleApp."	17 echo "Defaulting to running SampleApp."

18 app="SampleApp"	18 app="SampleApp"

19 APP_ARGS=( "SampleApp" ${APP_ARGS[*]} )	19 APP_ARGS=( "SampleApp" ${APP_ARGS[*]} )

20 fi	20 fi

21	21

22 if [[ ${app} == 'SampleApp' ]]; then	22 if [[ ${app} == 'SampleApp' ]]; then

23 activity="com.skia.sample_app/com.skia.SkiaSampleActivity"	23 activity="com.skia.sample_app/com.skia.SkiaSampleActivity"

24 elif [[ ${app} == "VisualBench" ]] ; then	24 elif [[ ${app} == "Viewer" ]] ; then

25 activity="org.skia.viewer/org.skia.viewer.ViewerActivity"	25 activity="org.skia.viewer/org.skia.viewer.ViewerActivity"

26 else	26 else

27 echo "ERROR: supports either 'SampleApp' or 'Viewer' as valid apps"	27 echo "ERROR: supports either 'SampleApp' or 'Viewer' as valid apps"

28 exit 1	28 exit 1

29 fi	29 fi

30 $ADB ${DEVICE_SERIAL} shell "am start -S -n ${activity} --es cmdLineFlags \"${AP P_ARGS[*]:1}\""	30 $ADB ${DEVICE_SERIAL} shell "am start -S -n ${activity} --es cmdLineFlags \"${AP P_ARGS[*]:1}\""

OLD	NEW