platform_tools/android/bin/android_install_app - Issue 865943007: Cleanup the android scripts.

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_install_app

Issue 865943007: Cleanup the android scripts. (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: actually saving the file Created 5 years, 10 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

« platform_tools/android/bin/android_gdb_native ('K') | « platform_tools/android/bin/android_install_apk ('k') | platform_tools/android/bin/android_install_skia » ('j') | site/user/quick/android.md » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

2 #	2 #

3 # android_install_skia: installs the skia apk on the device.	3 # android_install_app: installs the skia sampleApp on the device.

4	4

5 function print_usage {	5 function print_usage {

6 echo "USAGE: android_install_skia [options]"	6 echo "USAGE: android_install_app [options]"

7 echo " Options: -f Forces the package to be installed by removing any "	7 echo " Options: -f Forces the package to be installed by removing any "

8 echo " previously installed packages"	8 echo " previously installed packages"

9 echo " -h Prints this help message"	9 echo " -h Prints this help message"

10 echo " --release Install the release build of Skia"	10 echo " --release Install the release build of Skia"

11 echo " -s [device_s/n] Serial number of the device to be used"	11 echo " -s [device_s/n] Serial number of the device to be used"

12 }	12 }

13	13

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

15	15

16 source $SCRIPT_DIR/android_setup.sh	16 source $SCRIPT_DIR/android_setup.sh

(...skipping 23 matching lines...) Expand all Loading...
40 done	40 done

41	41

42 if [[ "$forceRemoval" == "true" ]];	42 if [[ "$forceRemoval" == "true" ]];

43 then	43 then

44 echo "Forcing removal of previously installed packages"	44 echo "Forcing removal of previously installed packages"

45 $ADB ${DEVICE_SERIAL} uninstall com.skia > /dev/null	45 $ADB ${DEVICE_SERIAL} uninstall com.skia > /dev/null

46 fi	46 fi

47	47

48 echo "Installing Skia App from ${SKIA_OUT}/${BUILDTYPE}"	48 echo "Installing Skia App from ${SKIA_OUT}/${BUILDTYPE}"

49 $ADB ${DEVICE_SERIAL} install ${installOptions} ${SKIA_OUT}/${BUILDTYPE}/android /bin/SkiaAndroid.apk	49 $ADB ${DEVICE_SERIAL} install ${installOptions} ${SKIA_OUT}/${BUILDTYPE}/android /bin/SkiaAndroid.apk

OLD	NEW