OLD | NEW |
1 #!/bin/bash | 1 #!/bin/bash |
2 ############################################################################### | 2 ############################################################################### |
3 # Copyright 2015 Google Inc. | 3 # Copyright 2015 Google Inc. |
4 # | 4 # |
5 # Use of this source code is governed by a BSD-style license that can be | 5 # Use of this source code is governed by a BSD-style license that can be |
6 # found in the LICENSE file. | 6 # found in the LICENSE file. |
7 ############################################################################### | 7 ############################################################################### |
8 # | 8 # |
9 # android_setup.sh: Sets environment variables used by other Android scripts. | 9 # android_setup.sh: Sets environment variables used by other Android scripts. |
10 | 10 |
(...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
164 ;; | 164 ;; |
165 esac | 165 esac |
166 | 166 |
167 verbose "The build is targeting the device: $TARGET_DEVICE" | 167 verbose "The build is targeting the device: $TARGET_DEVICE" |
168 exportVar DEVICE_ID $TARGET_DEVICE | 168 exportVar DEVICE_ID $TARGET_DEVICE |
169 | 169 |
170 # setup the appropriate cross compiling toolchains | 170 # setup the appropriate cross compiling toolchains |
171 source $SCRIPT_DIR/utils/setup_toolchain.sh | 171 source $SCRIPT_DIR/utils/setup_toolchain.sh |
172 | 172 |
173 DEFINES="${DEFINES} android_toolchain=${TOOLCHAIN_TYPE}" | 173 DEFINES="${DEFINES} android_toolchain=${TOOLCHAIN_TYPE}" |
| 174 DEFINES="${DEFINES} android_buildtype=${BUILDTYPE}" |
174 exportVar GYP_DEFINES "$DEFINES $GYP_DEFINES" | 175 exportVar GYP_DEFINES "$DEFINES $GYP_DEFINES" |
175 | 176 |
176 SKIA_SRC_DIR=$(cd "${SCRIPT_DIR}/../../.."; pwd) | 177 SKIA_SRC_DIR=$(cd "${SCRIPT_DIR}/../../.."; pwd) |
177 DEFAULT_SKIA_OUT="${SKIA_SRC_DIR}/out/config/android-${TARGET_DEVICE}" | 178 DEFAULT_SKIA_OUT="${SKIA_SRC_DIR}/out/config/android-${TARGET_DEVICE}" |
178 exportVar SKIA_OUT "${SKIA_OUT:-${DEFAULT_SKIA_OUT}}" | 179 exportVar SKIA_OUT "${SKIA_OUT:-${DEFAULT_SKIA_OUT}}" |
179 } | 180 } |
180 | 181 |
181 # adb_pull_if_needed(android_src, host_dst) | 182 # adb_pull_if_needed(android_src, host_dst) |
182 adb_pull_if_needed() { | 183 adb_pull_if_needed() { |
183 | 184 |
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
262 adb_push_if_needed $HOST_SRC $ANDROID_DST | 263 adb_push_if_needed $HOST_SRC $ANDROID_DST |
263 else | 264 else |
264 echo -n "$ANDROID_DST " | 265 echo -n "$ANDROID_DST " |
265 $ADB $DEVICE_SERIAL shell mkdir -p "$(dirname "$ANDROID_DST")" | 266 $ADB $DEVICE_SERIAL shell mkdir -p "$(dirname "$ANDROID_DST")" |
266 $ADB $DEVICE_SERIAL push $HOST_SRC $ANDROID_DST | 267 $ADB $DEVICE_SERIAL push $HOST_SRC $ANDROID_DST |
267 fi | 268 fi |
268 fi | 269 fi |
269 } | 270 } |
270 | 271 |
271 setup_device "${DEVICE_ID}" | 272 setup_device "${DEVICE_ID}" |
OLD | NEW |