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" |
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 echo " AppName Can be either sample_app or VisualBench" | 12 echo " AppName Can be either SampleApp or VisualBench" |
13 } | 13 } |
14 | 14 |
15 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" | 15 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" |
16 | 16 |
17 source $SCRIPT_DIR/android_setup.sh | 17 source $SCRIPT_DIR/android_setup.sh |
18 source $SCRIPT_DIR/utils/setup_adb.sh | 18 source $SCRIPT_DIR/utils/setup_adb.sh |
19 | 19 |
20 forceRemoval="false" | 20 forceRemoval="false" |
| 21 installLauncher="false" |
| 22 installOptions="-r" |
21 app="" | 23 app="" |
22 | 24 |
23 for arg in ${APP_ARGS[@]}; do | 25 for arg in ${APP_ARGS[@]}; do |
24 if [[ "${arg}" == "-f" ]]; then | 26 if [[ "${arg}" == "-f" ]]; then |
25 forceRemoval="true" | 27 forceRemoval="true" |
26 elif [[ "${arg}" == "-h" ]]; then | 28 elif [[ "${arg}" == "-h" ]]; then |
27 print_usage | 29 print_usage |
28 exit | 30 exit |
29 elif [[ "${arg}" == "-r" ]]; then | 31 elif [[ "${arg}" == "-r" ]]; then |
30 echo "DEPRECATED: -r is now a no-op" | 32 echo "DEPRECATED: -r is now a no-op" |
31 elif [[ ${arg} == '-'* ]]; then | 33 elif [[ ${arg} == '-'* ]]; then |
32 echo "ERROR: unrecognized option ${arg}" | 34 echo "ERROR: unrecognized option ${arg}" |
33 print_usage | 35 print_usage |
34 exit 1; | 36 exit 1; |
35 else | 37 else |
36 if [[ ${app} != "" ]]; then | 38 if [[ ${app} != "" ]]; then |
37 echo "ERROR: app already defined ${app}" | 39 echo "ERROR: app already defined ${app}" |
38 exit 1; | 40 exit 1; |
39 else | 41 else |
40 app=${arg} | 42 app=${arg} |
41 fi | 43 fi |
42 fi | 44 fi |
43 done | 45 done |
44 | 46 |
45 if [[ ${app} == "" ]]; then | 47 if [[ ${app} == "" ]]; then |
46 echo "defaulting to installing sample_app." | 48 echo "defaulting to installing SampleApp." |
47 app="sample_app" | 49 app="SampleApp" |
48 fi | 50 fi |
49 | 51 |
50 | 52 |
51 if [[ "$forceRemoval" == "true" ]]; | 53 if [[ "$forceRemoval" == "true" ]]; |
52 then | 54 then |
53 echo "Forcing removal of previously installed packages" | 55 echo "Forcing removal of previously installed packages" |
54 $ADB ${DEVICE_SERIAL} uninstall com.skia > /dev/null | 56 $ADB ${DEVICE_SERIAL} uninstall com.skia > /dev/null |
55 fi | 57 fi |
56 | 58 |
57 BUILD_TYPE_LC=$(echo $BUILDTYPE | tr "[:upper:]" "[:lower:]") | 59 echo "Installing ${app} from ${SKIA_OUT}/${BUILDTYPE}" |
| 60 $ADB ${DEVICE_SERIAL} install ${installOptions} ${SKIA_OUT}/${BUILDTYPE}/android
/${app}/bin/${app}.apk |
58 | 61 |
59 echo "Installing ${app} from ${app}/build/outputs/apk/${app}-${ANDROID_ARCH}-${B
UILD_TYPE_LC}.apk" | |
60 $ADB ${DEVICE_SERIAL} install -r ${SCRIPT_DIR}/../apps/${app}/build/outputs/apk/
${app}-${ANDROID_ARCH}-${BUILD_TYPE_LC}.apk | |
61 | |
OLD | NEW |