Skip to content

Commit e6a2b92

Browse files
committed
Android SDK build
1 parent 7db7744 commit e6a2b92

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

swift-ci/sdks/android/scripts/build.sh

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -342,10 +342,14 @@ for arch in $archs; do
342342
# use an out-of-tree build folder, otherwise subsequent arch builds have conflicts
343343
export SWIFT_BUILD_ROOT=${build_dir}/$arch/swift-project
344344

345+
# need to remove symlink that gets created in the NDK to the previous arch's build
346+
# or else we get errors like:
347+
# error: could not find module '_Builtin_float' for target 'x86_64-unknown-linux-android'; found: aarch64-unknown-linux-android, at: /home/runner/work/_temp/swift-android-sdk/ndk/android-ndk-r27c/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/swift/android/_Builtin_float.swiftmodule
348+
rm -f $ndk_toolchain/sysroot/usr/lib/swift
349+
345350
./swift/utils/build-script \
346351
$build_type_flag \
347352
--reconfigure \
348-
--clean \
349353
--no-assertions \
350354
--android \
351355
--android-ndk=$ndk_home \
@@ -369,6 +373,7 @@ for arch in $archs; do
369373
--cross-compile-append-host-target-to-destdir=False
370374

371375
#--clean-install-destdir \
376+
#--clean \
372377
quiet_popd
373378

374379
header "Completed build for $arch in $sdk_root"

0 commit comments

Comments
 (0)