Dev: add Swift6 support

Author: andriydruk

src/bash/generate-destination-json.sh

@@ -18,7 +18,7 @@ cat <<JSON > $SELF_DIR/$TARGET.json
         "-I$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include/$TRIPLE"
     ],
     "extra-swiftc-flags": [
-        "-Xfrontend", "-experimental-disable-objc-attr",
+        "-use-ld=lld",
         "-resource-dir", "$SWIFT_ANDROID_HOME/toolchain/usr/lib/swift-$SWIFT_ANDROID_ARCH",
         "-tools-directory", "$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/darwin-x86_64/bin",
         "-I$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/include",

src/bash/swift-build.sh

@@ -5,21 +5,20 @@
 SELF_DIR=$(dirname $0)
 SELF_DIR=$SELF_DIR/src/bash
 
-xcode_toolchain=$(dirname $(dirname $(dirname $(xcrun --find swift))))
+XCODE_TOOLCHAIN=/Library/Developer/Toolchains/swift-6.0.3-RELEASE.xctoolchain
+
+if [ ! -d "$XCODE_TOOLCHAIN" ]; then
+    echo "Toolchain not found at $XCODE_TOOLCHAIN"
+    echo "Please install the Swift 6.0.3 toolchain from https://www.swift.org/install/macos"
+    exit 1
+fi
 
 export BUILD_ANDROID=1
 ANDROID_API_LEVEL="${SWIFT_ANDROID_API_LEVEL:=24}"
 
 export CC="$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang"
 export CXX="$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang++"
 
-# swiftc dont know about CC/CXX so tell correct compiler path for him in more brutal way
-export PATH="$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/darwin-x86_64/bin:$PATH"
-
-export SWIFT_EXEC=$SWIFT_ANDROID_HOME/toolchain/usr/bin/swiftc
-export SWIFT_EXEC_MANIFEST=$xcode_toolchain/usr/bin/swiftc
-export SWIFTPM_CUSTOM_LIBS_DIR=$xcode_toolchain/usr/lib/swift/pm
-
 if [ ! -n "${SWIFT_ANDROID_ARCH+defined}" ] || [ "$SWIFT_ANDROID_ARCH" == "aarch64" ]
 then
     export SWIFT_ANDROID_ARCH=aarch64
@@ -52,9 +51,9 @@ fi
 include=-I.build/jniLibs/include
 libs=-L.build/jniLibs/$ABI
 
-flags="-Xcc $include -Xswiftc $include -Xswiftc $libs -Xmanifest -DTARGET_ANDROID"
+flags="-Xcc $include -Xswiftc $include -Xswiftc $libs -Xbuild-tools-swiftc -DTARGET_ANDROID"
 
 $SELF_DIR/generate-destination-json.sh
-$SWIFT_ANDROID_HOME/toolchain/usr/bin/swift-build --destination=$SELF_DIR/$TARGET.json $flags "$@"
+$XCODE_TOOLCHAIN/usr/bin/swift-build --destination=$SELF_DIR/$TARGET.json $flags "$@"
 
 exit $?

src/python/run_tests.py

@@ -5,7 +5,7 @@
 
 
 self_dir = os.path.dirname(__file__)
-swift_build = os.path.join(self_dir, "swift-build")
+swift_build = os.path.join(self_dir, "swift-android-build")
 
 
 def push(dst, name, skip_push_stdlib, skip_push_external, skip_push_resources, device=None):

src/python/utils.py

@@ -139,7 +139,7 @@ def setup(cls, configuration):
     @memoized
     def triple(cls):
         arch = os.environ.get("SWIFT_ANDROID_ARCH")
-        level = os.environ.get("SWIFT_ANDROID_API_LEVEL")
+        level = os.environ.get("SWIFT_ANDROID_API_LEVEL", "24")
 
         if arch == "aarch64" or arch is None:
             return "aarch64-unknown-linux-android{}".format(level)

swift-android

@@ -0,0 +1,18 @@
+#!/bin/bash
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+SCRIPT_NAME="swift-android-$1"
+
+if [[ -z "$1" ]]; then
+  echo "Usage: swift-android <command>"
+  exit 1
+fi
+
+EXECUTABLE="$SCRIPT_DIR/$SCRIPT_NAME"
+
+if [[ -x "$EXECUTABLE" ]]; then
+  exec "$EXECUTABLE" "${@:2}"
+else
+  echo "Error: Command '$SCRIPT_NAME' not found in '$SCRIPT_DIR' or not executable."
+  exit 1
+fi