OLD | NEW |
1 function exportVar { | 1 function exportVar { |
2 NAME=$1 | 2 NAME=$1 |
3 VALUE=$2 | 3 VALUE=$2 |
4 echo export $NAME=\"$VALUE\" | 4 echo export $NAME=\"$VALUE\" |
5 export $NAME="$VALUE" | 5 export $NAME="$VALUE" |
6 } | 6 } |
7 | 7 |
8 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" | 8 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" |
9 | 9 |
10 # A valid Android SDK installation is required to build the sample app. | 10 # A valid Android SDK installation is required to build the sample app. |
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
134 # Setup the build variation depending on the target device | 134 # Setup the build variation depending on the target device |
135 TARGET_DEVICE="$1" | 135 TARGET_DEVICE="$1" |
136 | 136 |
137 if [ -z "$TARGET_DEVICE" ]; then | 137 if [ -z "$TARGET_DEVICE" ]; then |
138 echo "INFO: no target device type was specified so using the default 'arm_v7
'" | 138 echo "INFO: no target device type was specified so using the default 'arm_v7
'" |
139 TARGET_DEVICE="arm_v7" | 139 TARGET_DEVICE="arm_v7" |
140 fi | 140 fi |
141 | 141 |
142 case $TARGET_DEVICE in | 142 case $TARGET_DEVICE in |
143 nexus_s) | 143 nexus_s) |
144 DEFINES="${DEFINES} skia_arch_type=arm arm_neon=1 armv7=1 arm_thumb=1" | 144 DEFINES="${DEFINES} skia_arch_type=arm arm_neon=1 arm_version=7 arm_thum
b=1" |
145 DEFINES="${DEFINES} skia_texture_cache_mb_limit=24" | 145 DEFINES="${DEFINES} skia_texture_cache_mb_limit=24" |
146 ;; | 146 ;; |
147 nexus_4 | nexus_7 | nexus_10) | 147 nexus_4 | nexus_7 | nexus_10) |
148 DEFINES="${DEFINES} skia_arch_type=arm arm_neon=1 armv7=1 arm_thumb=1" | 148 DEFINES="${DEFINES} skia_arch_type=arm arm_neon=1 arm_version=7 arm_thum
b=1" |
149 ;; | 149 ;; |
150 xoom) | 150 xoom) |
151 DEFINES="${DEFINES} skia_arch_type=arm arm_neon=0 armv7=1 arm_thumb=1" | 151 DEFINES="${DEFINES} skia_arch_type=arm arm_neon=0 arm_version=7 arm_thum
b=1" |
152 ;; | 152 ;; |
153 galaxy_nexus) | 153 galaxy_nexus) |
154 DEFINES="${DEFINES} skia_arch_type=arm arm_neon=1 armv7=1 arm_thumb=1" | 154 DEFINES="${DEFINES} skia_arch_type=arm arm_neon=1 arm_version=7 arm_thum
b=1" |
155 DEFINES="${DEFINES} skia_texture_cache_mb_limit=32" | 155 DEFINES="${DEFINES} skia_texture_cache_mb_limit=32" |
156 ;; | 156 ;; |
157 razr_i) | 157 razr_i) |
158 DEFINES="${DEFINES} skia_arch_type=x86 skia_arch_width=32" | 158 DEFINES="${DEFINES} skia_arch_type=x86 skia_arch_width=32" |
159 DEFINES="${DEFINES} skia_texture_cache_mb_limit=32" | 159 DEFINES="${DEFINES} skia_texture_cache_mb_limit=32" |
160 ;; | 160 ;; |
161 arm_v7) | 161 arm_v7) |
162 DEFINES="${DEFINES} skia_arch_type=arm arm_neon_optional=1 armv7=1 arm_t
humb=0" | 162 DEFINES="${DEFINES} skia_arch_type=arm arm_neon_optional=1 arm_version=7
arm_thumb=0" |
163 ;; | 163 ;; |
164 arm_v7_thumb) | 164 arm_v7_thumb) |
165 DEFINES="${DEFINES} skia_arch_type=arm arm_neon_optional=1 armv7=1 arm_t
humb=1" | 165 DEFINES="${DEFINES} skia_arch_type=arm arm_neon_optional=1 arm_version=7
arm_thumb=1" |
166 ;; | 166 ;; |
167 arm) | 167 arm) |
168 DEFINES="${DEFINES} skia_arch_type=arm arm_neon=0 armv7=0 arm_thumb=0" | 168 DEFINES="${DEFINES} skia_arch_type=arm arm_neon=0 arm_thumb=0" |
169 ;; | 169 ;; |
170 arm_thumb) | 170 arm_thumb) |
171 DEFINES="${DEFINES} skia_arch_type=arm arm_neon=0 armv7=0 arm_thumb=1" | 171 DEFINES="${DEFINES} skia_arch_type=arm arm_neon=0 arm_thumb=1" |
172 ;; | 172 ;; |
173 x86) | 173 x86) |
174 DEFINES="${DEFINES} skia_arch_type=x86 skia_arch_width=32" | 174 DEFINES="${DEFINES} skia_arch_type=x86 skia_arch_width=32" |
175 DEFINES="${DEFINES} skia_texture_cache_mb_limit=32" | 175 DEFINES="${DEFINES} skia_texture_cache_mb_limit=32" |
176 ;; | 176 ;; |
177 *) | 177 *) |
178 echo -n "ERROR: unknown device specified ($TARGET_DEVICE), valid values:
" | 178 echo -n "ERROR: unknown device specified ($TARGET_DEVICE), valid values:
" |
179 echo "nexus_[s,4,7,10] xoom galaxy_nexus razr_i arm arm_thumb arm_v7 arm
_v7_thumb x86" | 179 echo "nexus_[s,4,7,10] xoom galaxy_nexus razr_i arm arm_thumb arm_v7 arm
_v7_thumb x86" |
180 return 1; | 180 return 1; |
181 ;; | 181 ;; |
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
213 if [ "${ANDROID_MD5:0:32}" != "${HOST_MD5:0:32}" ]; | 213 if [ "${ANDROID_MD5:0:32}" != "${HOST_MD5:0:32}" ]; |
214 then | 214 then |
215 $ADB pull $ANDROID_SRC $HOST_DST | 215 $ADB pull $ANDROID_SRC $HOST_DST |
216 # else | 216 # else |
217 # echo "md5 match of android [$ANDROID_SRC] and host [$HOST_DST]" | 217 # echo "md5 match of android [$ANDROID_SRC] and host [$HOST_DST]" |
218 fi | 218 fi |
219 else | 219 else |
220 $ADB pull $ANDROID_SRC $HOST_DST | 220 $ADB pull $ANDROID_SRC $HOST_DST |
221 fi | 221 fi |
222 } | 222 } |
OLD | NEW |