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 61% |
copy from platform_tools/android/bin/android_install_skia |
copy to platform_tools/android/bin/android_install_apk |
index da16b1ab7a6015bdee0326cd94958e12c900ca46..ac162a1ed2db0c0e0974ddd08f2d9ffab2c03382 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" |
} |
@@ -22,7 +20,6 @@ forceRemoval="false" |
installLauncher="false" |
installOptions="-r" |
configuration="Debug" |
-serialNumber="" |
while (( "$#" )); do |
@@ -33,24 +30,12 @@ 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" |
elif [[ "$1" == "--release" ]]; |
then |
configuration="Release" |
- elif [[ "$1" == "-s" ]]; |
- then |
- if [[ $# -lt 2 ]]; |
- then |
- echo "ERROR: missing serial number" |
- exit 1; |
- fi |
- serialNumber="-s $2" |
- shift |
else |
echo "ERROR: unrecognized option $1" |
print_usage |
@@ -63,16 +48,8 @@ done |
if [[ "$forceRemoval" == "true" ]]; |
then |
echo "Forcing removal of previously installed packages" |
- $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 |
+ $ADB ${DEVICE_SERIAL} uninstall com.skia > /dev/null |
fi |
echo "Installing Skia App from ${SKIA_OUT}/${configuration}" |
-$ADB ${serialNumber} install ${installOptions} ${SKIA_OUT}/${configuration}/android/bin/SkiaAndroid.apk |
+$ADB ${DEVICE_SERIAL} install ${installOptions} ${SKIA_OUT}/${configuration}/android/bin/SkiaAndroid.apk |