Skip to content

Commit da07685

Browse files
committed
Swift Android build 6.2
1 parent 5a01823 commit da07685

File tree

1 file changed

+1
-4
lines changed

1 file changed

+1
-4
lines changed

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -462,6 +462,7 @@ EOF
462462
mkdir -p $swift_res_root/usr/lib/swift/clang/lib
463463
cp -r $host_toolchain/lib/clang/*/include $swift_res_root/usr/lib/swift/clang
464464

465+
465466
for arch in $archs; do
466467
quiet_pushd ${sdk_staging}/${arch}/usr
467468
rm -r bin
@@ -503,12 +504,8 @@ if [ "${NDK_LOCATION}" = "external" ]; then
503504
# see: https://github.com/swiftlang/swift-driver/pull/1822#issuecomment-2762811807
504505
if [ "true" = "true" ]; then
505506
SWIFTRT=android/x86_64/swiftrt.o
506-
507507
mkdir -p ${ndk_sysroot}/usr/lib/swift/android/x86_64
508508
ln -srv ${swift_res_root}/usr/lib/swift-x86_64/${SWIFTRT} ${ndk_sysroot}/usr/lib/swift/${SWIFTRT}
509-
510-
mkdir -p ${ndk_sysroot}/usr/lib/swift_static/android/x86_64
511-
#ln -srv ${swift_res_root}/usr/lib/swift_static-x86_64/${SWIFTRT} ${ndk_sysroot}/usr/lib/swift_static/${SWIFTRT}
512509
else
513510
# try brute copying swiftrt.o to EVERY directory to see if it gets picked up somehow
514511
echo "Seeking workaround for swiftrt.o needing to be under sdkRoot"

0 commit comments

Comments
 (0)