| 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 205 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 216 ANDROID_ARCH="arm" | 216 ANDROID_ARCH="arm" |
| 217 ;; | 217 ;; |
| 218 arm) | 218 arm) |
| 219 DEFINES="${DEFINES} skia_arch_type=arm arm_neon=0 arm_thumb=0" | 219 DEFINES="${DEFINES} skia_arch_type=arm arm_neon=0 arm_thumb=0" |
| 220 ANDROID_ARCH="arm" | 220 ANDROID_ARCH="arm" |
| 221 ;; | 221 ;; |
| 222 arm_thumb) | 222 arm_thumb) |
| 223 DEFINES="${DEFINES} skia_arch_type=arm arm_neon=0 arm_thumb=1" | 223 DEFINES="${DEFINES} skia_arch_type=arm arm_neon=0 arm_thumb=1" |
| 224 ANDROID_ARCH="arm" | 224 ANDROID_ARCH="arm" |
| 225 ;; | 225 ;; |
| 226 mips) |
| 227 DEFINES="${DEFINES} skia_arch_type=mips skia_arch_width=32" |
| 228 DEFINES="${DEFINES} skia_resource_cache_mb_limit=32" |
| 229 ANDROID_ARCH="mips" |
| 230 ;; |
| 226 x86) | 231 x86) |
| 227 DEFINES="${DEFINES} skia_arch_type=x86 skia_arch_width=32" | 232 DEFINES="${DEFINES} skia_arch_type=x86 skia_arch_width=32" |
| 228 DEFINES="${DEFINES} skia_resource_cache_mb_limit=32" | 233 DEFINES="${DEFINES} skia_resource_cache_mb_limit=32" |
| 229 ANDROID_ARCH="x86" | 234 ANDROID_ARCH="x86" |
| 230 ;; | 235 ;; |
| 231 *) | 236 *) |
| 232 echo -n "ERROR: unknown device specified ($TARGET_DEVICE), valid values: " | 237 echo -n "ERROR: unknown device specified ($TARGET_DEVICE), valid values: " |
| 233 echo "nexus_[s,4,7,10] xoom galaxy_nexus razr_i arm arm_thumb arm_v7 arm_v
7_thumb x86" | 238 echo "nexus_[s,4,7,10] xoom galaxy_nexus razr_i arm arm_thumb arm_v7 arm_v
7_thumb x86" |
| 234 return 1; | 239 return 1; |
| 235 ;; | 240 ;; |
| (...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 325 else | 330 else |
| 326 $ADB $DEVICE_SERIAL push $HOST_SRC $ANDROID_DST | 331 $ADB $DEVICE_SERIAL push $HOST_SRC $ANDROID_DST |
| 327 fi | 332 fi |
| 328 } | 333 } |
| 329 | 334 |
| 330 # Set up the device. | 335 # Set up the device. |
| 331 setup_device "${DEVICE_ID}" | 336 setup_device "${DEVICE_ID}" |
| 332 if [[ "$?" != "0" ]]; then | 337 if [[ "$?" != "0" ]]; then |
| 333 exit 1 | 338 exit 1 |
| 334 fi | 339 fi |
| OLD | NEW |