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 # Fail-fast if anything in the script fails. | 5 # Fail-fast if anything in the script fails. |
6 set -e | 6 set -e |
7 | 7 |
8 BUILDTYPE=${BUILDTYPE-Debug} | 8 BUILDTYPE=${BUILDTYPE-Debug} |
9 | 9 |
10 while (( "$#" )); do | 10 while (( "$#" )); do |
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
104 ;; | 104 ;; |
105 xoom) | 105 xoom) |
106 DEFINES="${DEFINES} skia_arch_type=arm arm_neon=0 arm_version=7 arm_thumb=
1" | 106 DEFINES="${DEFINES} skia_arch_type=arm arm_neon=0 arm_version=7 arm_thumb=
1" |
107 ANDROID_ARCH="arm" | 107 ANDROID_ARCH="arm" |
108 ;; | 108 ;; |
109 galaxy_nexus) | 109 galaxy_nexus) |
110 DEFINES="${DEFINES} skia_arch_type=arm arm_neon=1 arm_version=7 arm_thumb=
1" | 110 DEFINES="${DEFINES} skia_arch_type=arm arm_neon=1 arm_version=7 arm_thumb=
1" |
111 DEFINES="${DEFINES} skia_resource_cache_mb_limit=32" | 111 DEFINES="${DEFINES} skia_resource_cache_mb_limit=32" |
112 ANDROID_ARCH="arm" | 112 ANDROID_ARCH="arm" |
113 ;; | 113 ;; |
114 intel_rhb | razr_i | x86) | 114 intel_rhb | razr_i) |
115 DEFINES="${DEFINES} skia_arch_type=x86 skia_arch_width=32" | 115 DEFINES="${DEFINES} skia_arch_type=x86 skia_arch_width=32" |
116 DEFINES="${DEFINES} skia_resource_cache_mb_limit=32" | 116 DEFINES="${DEFINES} skia_resource_cache_mb_limit=32" |
117 ANDROID_ARCH="x86" | 117 ANDROID_ARCH="x86" |
118 ;; | 118 ;; |
| 119 x86) |
| 120 DEFINES="${DEFINES} skia_arch_type=x86 skia_arch_width=32" |
| 121 ANDROID_ARCH="x86" |
| 122 ;; |
119 x86_64 | x64) | 123 x86_64 | x64) |
120 DEFINES="${DEFINES} skia_arch_type=x86 skia_arch_width=64" | 124 DEFINES="${DEFINES} skia_arch_type=x86 skia_arch_width=64" |
121 ANDROID_ARCH="x86_64" | 125 ANDROID_ARCH="x86_64" |
122 ;; | 126 ;; |
123 arm_v7) | 127 arm_v7) |
124 DEFINES="${DEFINES} skia_arch_type=arm arm_neon_optional=1 arm_version=7 a
rm_thumb=0" | 128 DEFINES="${DEFINES} skia_arch_type=arm arm_neon_optional=1 arm_version=7 a
rm_thumb=0" |
125 ANDROID_ARCH="arm" | 129 ANDROID_ARCH="arm" |
126 ;; | 130 ;; |
127 arm_v7_thumb | nvidia_logan | nexus_5) | 131 arm_v7_thumb | nvidia_logan | nexus_5) |
128 DEFINES="${DEFINES} skia_arch_type=arm arm_neon_optional=1 arm_version=7 a
rm_thumb=1" | 132 DEFINES="${DEFINES} skia_arch_type=arm arm_neon_optional=1 arm_version=7 a
rm_thumb=1" |
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
256 adb_push_if_needed $HOST_SRC $ANDROID_DST | 260 adb_push_if_needed $HOST_SRC $ANDROID_DST |
257 else | 261 else |
258 echo -n "$ANDROID_DST " | 262 echo -n "$ANDROID_DST " |
259 $ADB $DEVICE_SERIAL shell mkdir -p "$(dirname "$ANDROID_DST")" | 263 $ADB $DEVICE_SERIAL shell mkdir -p "$(dirname "$ANDROID_DST")" |
260 $ADB $DEVICE_SERIAL push $HOST_SRC $ANDROID_DST | 264 $ADB $DEVICE_SERIAL push $HOST_SRC $ANDROID_DST |
261 fi | 265 fi |
262 fi | 266 fi |
263 } | 267 } |
264 | 268 |
265 setup_device "${DEVICE_ID}" | 269 setup_device "${DEVICE_ID}" |
OLD | NEW |