File tree Expand file tree Collapse file tree 2 files changed +27
-5
lines changed
swift-ci/sdks/android/scripts Expand file tree Collapse file tree 2 files changed +27
-5
lines changed Original file line number Diff line number Diff line change @@ -265,11 +265,31 @@ function run() {
265
265
266
266
for arch in $archs ; do
267
267
case $arch in
268
- armv7) target_host=" arm-linux-androideabi" ; compiler_target_host=" armv7a-linux-androideabi$android_api " ; android_abi=" armeabi-v7a" ;;
269
- aarch64) target_host=" aarch64-linux-android" ; compiler_target_host=" $target_host$android_api " ; android_abi=" arm64-v8a" ;;
270
- x86_64) target_host=" x86_64-linux-android" ; compiler_target_host=" $target_host$android_api " ; android_abi=" x86_64" ;;
271
- x86) target_host=" x86-linux-android" ; compiler_target_host=" $target_host$android_api " ; android_abi=" x86" ;;
272
- * ) echo " Unknown architecture '$1 '" ; usage; exit 0 ;;
268
+ armv7)
269
+ target_host=" arm-linux-androideabi"
270
+ compiler_target_host=" armv7a-linux-androideabi$android_api "
271
+ android_abi=" armeabi-v7a"
272
+ ;;
273
+ aarch64)
274
+ target_host=" aarch64-linux-android"
275
+ compiler_target_host=" $target_host$android_api "
276
+ android_abi=" arm64-v8a"
277
+ ;;
278
+ x86_64)
279
+ target_host=" x86_64-linux-android"
280
+ compiler_target_host=" $target_host$android_api "
281
+ android_abi=" x86_64"
282
+ ;;
283
+ x86)
284
+ target_host=" x86-linux-android"
285
+ compiler_target_host=" $target_host$android_api "
286
+ android_abi=" x86"
287
+ ;;
288
+ * )
289
+ echo " Unknown architecture '$1 '"
290
+ usage
291
+ exit 0
292
+ ;;
273
293
esac
274
294
275
295
sdk_root=${build_dir} /sdk_root/${arch}
Original file line number Diff line number Diff line change @@ -160,7 +160,9 @@ groupend
160
160
161
161
# Fetch yams (needed for Swift 6.1.1)
162
162
groupstart " Fetching yams"
163
+ pushd swift-project > /dev/null
163
164
[[ -d yams ]] || git clone ${github} jpsim/Yams.git yams
165
+ popd > /dev/null
164
166
groupend
165
167
166
168
# Fetch libxml2
You can’t perform that action at this time.
0 commit comments