platform_tools/android/bin/android_launch_app - Issue 1258253002: Fix android_launch_app after Gradle change

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 1258253002: Fix android_launch_app after Gradle change (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: Created 5 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

« 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 app="SampleApp"	17 app="SampleApp"

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

19 fi	19 fi

20	20

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

22 $ADB ${DEVICE_SERIAL} shell am start -S -n "com.skia/.SkiaSampleActivity" -- es "cmdLineFlags" "${APP_ARGS[*]:1}"	22 $ADB ${DEVICE_SERIAL} shell am start -S -n "com.skia.sampleapp/com.skia.Skia SampleActivity" --es "cmdLineFlags" "${APP_ARGS[*]:1}"

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

24 $ADB ${DEVICE_SERIAL} shell am start -S -n "com.skia/.VisualBenchActivity" - -es "cmdLineFlags" \"${APP_ARGS[*]:1}\"	24 $ADB ${DEVICE_SERIAL} shell am start -S -n "com.skia.visualbench/com.skia.Vi sualBenchActivity" --es "cmdLineFlags" \"${APP_ARGS[*]:1}\"

25 else	25 else

26 echo "ERROR: supports either 'SampleApp' or 'VisualBench' as valid apps"	26 echo "ERROR: supports either 'SampleApp' or 'VisualBench' as valid apps"

27 fi	27 fi

28	28

OLD	NEW