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 166 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
177 ;; | 177 ;; |
178 xoom) | 178 xoom) |
179 DEFINES="${DEFINES} skia_arch_type=arm arm_neon=0 arm_version=7 arm_thumb=
1" | 179 DEFINES="${DEFINES} skia_arch_type=arm arm_neon=0 arm_version=7 arm_thumb=
1" |
180 ANDROID_ARCH="arm" | 180 ANDROID_ARCH="arm" |
181 ;; | 181 ;; |
182 galaxy_nexus) | 182 galaxy_nexus) |
183 DEFINES="${DEFINES} skia_arch_type=arm arm_neon=1 arm_version=7 arm_thumb=
1" | 183 DEFINES="${DEFINES} skia_arch_type=arm arm_neon=1 arm_version=7 arm_thumb=
1" |
184 DEFINES="${DEFINES} skia_texture_cache_mb_limit=32" | 184 DEFINES="${DEFINES} skia_texture_cache_mb_limit=32" |
185 ANDROID_ARCH="arm" | 185 ANDROID_ARCH="arm" |
186 ;; | 186 ;; |
| 187 intel_rhb) |
| 188 DEFINES="${DEFINES} skia_arch_type=x86 skia_arch_width=32" |
| 189 DEFINES="${DEFINES} skia_texture_cache_mb_limit=32" |
| 190 ANDROID_ARCH="x86" |
| 191 ;; |
187 razr_i) | 192 razr_i) |
188 DEFINES="${DEFINES} skia_arch_type=x86 skia_arch_width=32" | 193 DEFINES="${DEFINES} skia_arch_type=x86 skia_arch_width=32" |
189 DEFINES="${DEFINES} skia_texture_cache_mb_limit=32" | 194 DEFINES="${DEFINES} skia_texture_cache_mb_limit=32" |
190 ANDROID_ARCH="x86" | 195 ANDROID_ARCH="x86" |
191 ;; | 196 ;; |
192 arm_v7) | 197 arm_v7) |
193 DEFINES="${DEFINES} skia_arch_type=arm arm_neon_optional=1 arm_version=7 a
rm_thumb=0" | 198 DEFINES="${DEFINES} skia_arch_type=arm arm_neon_optional=1 arm_version=7 a
rm_thumb=0" |
194 ANDROID_ARCH="arm" | 199 ANDROID_ARCH="arm" |
195 ;; | 200 ;; |
196 arm_v7_thumb) | 201 arm_v7_thumb) |
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
301 else | 306 else |
302 $ADB $DEVICE_SERIAL push $HOST_SRC $ANDROID_DST | 307 $ADB $DEVICE_SERIAL push $HOST_SRC $ANDROID_DST |
303 fi | 308 fi |
304 } | 309 } |
305 | 310 |
306 # Set up the device. | 311 # Set up the device. |
307 setup_device "${DEVICE_ID}" | 312 setup_device "${DEVICE_ID}" |
308 if [[ "$?" != "0" ]]; then | 313 if [[ "$?" != "0" ]]; then |
309 exit 1 | 314 exit 1 |
310 fi | 315 fi |
OLD | NEW |