| Index: platform_tools/android/bin/android_install_apk
|
| diff --git a/platform_tools/android/bin/android_install_skia b/platform_tools/android/bin/android_install_apk
|
| similarity index 77%
|
| copy from platform_tools/android/bin/android_install_skia
|
| copy to platform_tools/android/bin/android_install_apk
|
| index da16b1ab7a6015bdee0326cd94958e12c900ca46..c422e4e43903b48a57fcc0fe545c2589ffd75994 100755
|
| --- a/platform_tools/android/bin/android_install_skia
|
| +++ b/platform_tools/android/bin/android_install_apk
|
| @@ -7,8 +7,6 @@ function print_usage {
|
| echo " Options: -f Forces the package to be installed by removing any"
|
| echo " previously installed packages"
|
| echo " -h Prints this help message"
|
| - echo " --install-launcher Remounts the system partition and installs the"
|
| - echo " skia_launcher binary on the device"
|
| echo " --release Install the release build of Skia"
|
| echo " -s [device_s/n] Serial number of the device to be used"
|
| }
|
| @@ -33,9 +31,6 @@ while (( "$#" )); do
|
| then
|
| print_usage
|
| exit
|
| - elif [[ "$1" == "--install-launcher" ]];
|
| - then
|
| - installLauncher="true"
|
| elif [[ "$1" == "-r" ]];
|
| then
|
| echo "DEPRECATED: -r is now a no-op"
|
| @@ -66,13 +61,5 @@ then
|
| $ADB ${serialNumber} uninstall com.skia > /dev/null
|
| fi
|
|
|
| -if [[ "$installLauncher" == "true" ]];
|
| -then
|
| - echo "Installing skia_launcher binary"
|
| - $ADB ${serialNumber} root
|
| - $ADB ${serialNumber} remount
|
| - $ADB ${serialNumber} push ${SKIA_OUT}/${configuration}/skia_launcher /system/bin
|
| -fi
|
| -
|
| echo "Installing Skia App from ${SKIA_OUT}/${configuration}"
|
| $ADB ${serialNumber} install ${installOptions} ${SKIA_OUT}/${configuration}/android/bin/SkiaAndroid.apk
|
|
|