| OLD | NEW |
| 1 #!/bin/bash | 1 #!/bin/bash |
| 2 # | 2 # |
| 3 # android_install_skia: installs the skia apk on the device. | 3 # android_install_skia: installs the skia apk 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_skia [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 |
| 17 source $SCRIPT_DIR/utils/setup_adb.sh | 17 source $SCRIPT_DIR/utils/setup_adb.sh |
| 18 | 18 |
| 19 forceRemoval="false" | 19 forceRemoval="false" |
| 20 installLauncher="false" | 20 installLauncher="false" |
| 21 installOptions="-r" | 21 installOptions="-r" |
| 22 configuration="Debug" | 22 configuration="Debug" |
| 23 | 23 |
| 24 while (( "$#" )); do | 24 for arg in ${APP_ARGS[@]} |
| 25 | 25 do |
| 26 if [[ "$1" == "-f" ]]; | 26 if [[ "${arg}" == "-f" ]]; |
| 27 then | 27 then |
| 28 forceRemoval="true" | 28 forceRemoval="true" |
| 29 elif [[ "$1" == "-h" ]]; | 29 elif [[ "${arg}" == "-h" ]]; |
| 30 then | 30 then |
| 31 print_usage | 31 print_usage |
| 32 exit | 32 exit |
| 33 elif [[ "$1" == "-r" ]]; | 33 elif [[ "${arg}" == "-r" ]]; |
| 34 then | 34 then |
| 35 echo "DEPRECATED: -r is now a no-op" | 35 echo "DEPRECATED: -r is now a no-op" |
| 36 elif [[ "$1" == "--release" ]]; | 36 elif [[ "${arg}" == "--release" ]]; |
| 37 then | 37 then |
| 38 configuration="Release" | 38 configuration="Release" |
| 39 else | 39 else |
| 40 echo "ERROR: unrecognized option $1" | 40 echo "ERROR: unrecognized option ${arg}" |
| 41 print_usage | 41 print_usage |
| 42 exit 1; | 42 exit 1; |
| 43 fi | 43 fi |
| 44 | |
| 45 shift | |
| 46 done | 44 done |
| 47 | 45 |
| 48 if [[ "$forceRemoval" == "true" ]]; | 46 if [[ "$forceRemoval" == "true" ]]; |
| 49 then | 47 then |
| 50 echo "Forcing removal of previously installed packages" | 48 echo "Forcing removal of previously installed packages" |
| 51 $ADB ${DEVICE_SERIAL} uninstall com.skia > /dev/null | 49 $ADB ${DEVICE_SERIAL} uninstall com.skia > /dev/null |
| 52 fi | 50 fi |
| 53 | 51 |
| 54 echo "Installing Skia App from ${SKIA_OUT}/${configuration}" | 52 echo "Installing Skia App from ${SKIA_OUT}/${configuration}" |
| 55 $ADB ${DEVICE_SERIAL} install ${installOptions} ${SKIA_OUT}/${configuration}/and
roid/bin/SkiaAndroid.apk | 53 $ADB ${DEVICE_SERIAL} install ${installOptions} ${SKIA_OUT}/${configuration}/and
roid/bin/SkiaAndroid.apk |
| OLD | NEW |