| OLD | NEW |
| 1 #!/bin/bash | 1 #!/bin/bash |
| 2 # | 2 # |
| 3 # android_install_app: installs the skia sampleApp 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_app [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" |
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 49 | 49 |
| 50 | 50 |
| 51 if [[ "$forceRemoval" == "true" ]]; | 51 if [[ "$forceRemoval" == "true" ]]; |
| 52 then | 52 then |
| 53 echo "Forcing removal of previously installed packages" | 53 echo "Forcing removal of previously installed packages" |
| 54 $ADB ${DEVICE_SERIAL} uninstall com.skia > /dev/null | 54 $ADB ${DEVICE_SERIAL} uninstall com.skia > /dev/null |
| 55 fi | 55 fi |
| 56 | 56 |
| 57 if [[ "$BUILDTYPE" == "Release" ]]; | 57 if [[ "$BUILDTYPE" == "Release" ]]; |
| 58 then | 58 then |
| 59 apk_suffix="release-unsigned.apk" | 59 apk_suffix="release.apk" |
| 60 else | 60 else |
| 61 apk_suffix="debug.apk" | 61 apk_suffix="debug.apk" |
| 62 fi | 62 fi |
| 63 | 63 |
| 64 | 64 |
| 65 APP_LC=$(echo $app | tr "[:upper:]" "[:lower:]") | 65 APP_LC=$(echo $app | tr "[:upper:]" "[:lower:]") |
| 66 | 66 |
| 67 echo "Installing ${APP_LC} from ${APP_LC}/build/outputs/apk/${APP_LC}-${ANDROID_
ARCH}-${apk_suffix}" | 67 echo "Installing ${APP_LC} from ${APP_LC}/build/outputs/apk/${APP_LC}-${ANDROID_
ARCH}-${apk_suffix}" |
| 68 $ADB ${DEVICE_SERIAL} install -r ${SCRIPT_DIR}/../apps/${APP_LC}/build/outputs/a
pk/${APP_LC}-${ANDROID_ARCH}-${apk_suffix} | 68 $ADB ${DEVICE_SERIAL} install -r ${SCRIPT_DIR}/../apps/${APP_LC}/build/outputs/a
pk/${APP_LC}-${ANDROID_ARCH}-${apk_suffix} |
| 69 | 69 |
| OLD | NEW |