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 130 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
141 | 141 |
142 verbose "The build is targeting the device: $TARGET_DEVICE" | 142 verbose "The build is targeting the device: $TARGET_DEVICE" |
143 exportVar DEVICE_ID $TARGET_DEVICE | 143 exportVar DEVICE_ID $TARGET_DEVICE |
144 | 144 |
145 # setup the appropriate cross compiling toolchains | 145 # setup the appropriate cross compiling toolchains |
146 source $SCRIPT_DIR/utils/setup_toolchain.sh | 146 source $SCRIPT_DIR/utils/setup_toolchain.sh |
147 | 147 |
148 DEFINES="${DEFINES} android_toolchain=${TOOLCHAIN_TYPE}" | 148 DEFINES="${DEFINES} android_toolchain=${TOOLCHAIN_TYPE}" |
149 | 149 |
150 exportVar GYP_DEFINES "$DEFINES $GYP_DEFINES" | 150 exportVar GYP_DEFINES "$DEFINES $GYP_DEFINES" |
151 exportVar SKIA_OUT "out/config/android-${TARGET_DEVICE}" | 151 exportVar SKIA_OUT "${SKIA_OUT:-out/config/android-${TARGET_DEVICE}}" |
152 } | 152 } |
153 | 153 |
154 # adb_pull_if_needed(android_src, host_dst) | 154 # adb_pull_if_needed(android_src, host_dst) |
155 adb_pull_if_needed() { | 155 adb_pull_if_needed() { |
156 | 156 |
157 # get adb location | 157 # get adb location |
158 source $SCRIPT_DIR/utils/setup_adb.sh | 158 source $SCRIPT_DIR/utils/setup_adb.sh |
159 | 159 |
160 # read input params | 160 # read input params |
161 ANDROID_SRC="$1" | 161 ANDROID_SRC="$1" |
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
218 echo -n "$ANDROID_DST " | 218 echo -n "$ANDROID_DST " |
219 $ADB $DEVICE_SERIAL push $HOST_SRC $ANDROID_DST | 219 $ADB $DEVICE_SERIAL push $HOST_SRC $ANDROID_DST |
220 fi | 220 fi |
221 else | 221 else |
222 echo -n "$ANDROID_DST " | 222 echo -n "$ANDROID_DST " |
223 $ADB $DEVICE_SERIAL push $HOST_SRC $ANDROID_DST | 223 $ADB $DEVICE_SERIAL push $HOST_SRC $ANDROID_DST |
224 fi | 224 fi |
225 } | 225 } |
226 | 226 |
227 setup_device "${DEVICE_ID}" | 227 setup_device "${DEVICE_ID}" |
OLD | NEW |