| OLD | NEW |
| 1 #!/bin/bash | 1 #!/bin/bash |
| 2 # | 2 # |
| 3 # android_setup.sh: Sets environment variables used by other Android scripts. | 3 # android_setup.sh: Sets environment variables used by other Android scripts. |
| 4 | 4 |
| 5 # Parse the arguments for a DEVICE_ID. | 5 # Parse the arguments for a DEVICE_ID. |
| 6 DEVICE_ID="" | 6 DEVICE_ID="" |
| 7 DEVICE_SERIAL="" | 7 DEVICE_SERIAL="" |
| 8 while (( "$#" )); do | 8 while (( "$#" )); do |
| 9 if [[ $(echo "$1" | grep "^-d$") != "" ]]; | 9 if [[ $(echo "$1" | grep "^-d$") != "" ]]; |
| 10 then | 10 then |
| (...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 202 ;; | 202 ;; |
| 203 razr_i) | 203 razr_i) |
| 204 DEFINES="${DEFINES} skia_arch_type=x86 skia_arch_width=32" | 204 DEFINES="${DEFINES} skia_arch_type=x86 skia_arch_width=32" |
| 205 DEFINES="${DEFINES} skia_resource_cache_mb_limit=32" | 205 DEFINES="${DEFINES} skia_resource_cache_mb_limit=32" |
| 206 ANDROID_ARCH="x86" | 206 ANDROID_ARCH="x86" |
| 207 ;; | 207 ;; |
| 208 arm_v7) | 208 arm_v7) |
| 209 DEFINES="${DEFINES} skia_arch_type=arm arm_neon_optional=1 arm_version=7 a
rm_thumb=0" | 209 DEFINES="${DEFINES} skia_arch_type=arm arm_neon_optional=1 arm_version=7 a
rm_thumb=0" |
| 210 ANDROID_ARCH="arm" | 210 ANDROID_ARCH="arm" |
| 211 ;; | 211 ;; |
| 212 arm_v7_thumb) | 212 arm_v7_thumb | nvidia_logan) |
| 213 DEFINES="${DEFINES} skia_arch_type=arm arm_neon_optional=1 arm_version=7 a
rm_thumb=1" | 213 DEFINES="${DEFINES} skia_arch_type=arm arm_neon_optional=1 arm_version=7 a
rm_thumb=1" |
| 214 ANDROID_ARCH="arm" | 214 ANDROID_ARCH="arm" |
| 215 ;; | 215 ;; |
| 216 arm) | 216 arm) |
| 217 DEFINES="${DEFINES} skia_arch_type=arm arm_neon=0 arm_thumb=0" | 217 DEFINES="${DEFINES} skia_arch_type=arm arm_neon=0 arm_thumb=0" |
| 218 ANDROID_ARCH="arm" | 218 ANDROID_ARCH="arm" |
| 219 ;; | 219 ;; |
| 220 arm_thumb) | 220 arm_thumb) |
| 221 DEFINES="${DEFINES} skia_arch_type=arm arm_neon=0 arm_thumb=1" | 221 DEFINES="${DEFINES} skia_arch_type=arm arm_neon=0 arm_thumb=1" |
| 222 ANDROID_ARCH="arm" | 222 ANDROID_ARCH="arm" |
| (...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 323 else | 323 else |
| 324 $ADB $DEVICE_SERIAL push $HOST_SRC $ANDROID_DST | 324 $ADB $DEVICE_SERIAL push $HOST_SRC $ANDROID_DST |
| 325 fi | 325 fi |
| 326 } | 326 } |
| 327 | 327 |
| 328 # Set up the device. | 328 # Set up the device. |
| 329 setup_device "${DEVICE_ID}" | 329 setup_device "${DEVICE_ID}" |
| 330 if [[ "$?" != "0" ]]; then | 330 if [[ "$?" != "0" ]]; then |
| 331 exit 1 | 331 exit 1 |
| 332 fi | 332 fi |
| OLD | NEW |