Dev: update collect toolchain

Author: andriydruk

.github/workflows/build-android-toolchain.yml

@@ -313,10 +313,6 @@ jobs:
         path: ~/swift-android/lib
     - name: Build Corelibs
       run: ./build/052-build-corelibs.sh arm64 aarch64 aarch64-linux-android arm64-v8a aarch64-linux-android
-    - uses: actions/upload-artifact@v4
-      with:
-        name: swift-android-clang-libs
-        path: ~/swift-toolchain/usr/lib/clang
     - uses: actions/upload-artifact@v4
       with:
         name: swift-android-arm64-v8a-libs
@@ -465,8 +461,20 @@ jobs:
         path: ~/lib/swift-i686
     - uses: actions/download-artifact@v4
       with:
-        name: swift-android-clang-libs
-        path: ~/lib/clang
+        name: swift-android-arm64-v8a
+        path: ~/stdlib/swift-aarch64
+    - uses: actions/download-artifact@v4
+      with:
+        name: swift-android-armeabi-v7a
+        path: ~/stdlib/swift-armv7
+    - uses: actions/download-artifact@v4
+      with:
+        name: swift-android-x86_64
+        path: ~/stdlib/swift-x86_64
+    - uses: actions/download-artifact@v4
+      with:
+        name: swift-android-x86
+        path: ~/stdlib/swift-i686
     - name: Collect toolchain
       run: ./build/060-collect-toolchain.sh
     - uses: actions/upload-artifact@v4

build/052-build-corelibs.sh

@@ -90,8 +90,6 @@ cmake --build $xctest_build_dir --target install
 swift_include=$HOME/swift-toolchain/usr/lib/swift
 dst_libs=$HOME/swift-toolchain/usr/lib/swift/android
 
-rsync -av $ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/$clang_arch/libc++_shared.so $dst_libs
-
 rsync -av $openssl_libs/lib/libcrypto.a $dst_libs
 rsync -av $openssl_libs/lib/libssl.a $dst_libs
 rsync -av $curl_libs/lib/libcurl.* $dst_libs

build/060-collect-toolchain.sh

@@ -11,13 +11,42 @@ out_toolchain=$out/toolchain
 
 mkdir -p $out
 mkdir -p $out_toolchain
-mkdir -p $out_toolchain/usr
 
-input_libs=$HOME/lib
+input_stdlib=$HOME/stdlib
+input_lib=$HOME/lib
 
 pushd $out
-    rsync -av $input_libs $out_toolchain/usr --exclude 'lib/clang/17/lib'
-
+    # Copy NDK sysroot
+    rsync -av $ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64/sysroot/ $out_toolchain/
+
+    # Create swift folders
+    mkdir -p $out_toolchain/usr/lib/swift-aarch64
+    mkdir -p $out_toolchain/usr/lib/swift-armv7
+    mkdir -p $out_toolchain/usr/lib/swift-x86_64
+    mkdir -p $out_toolchain/usr/lib/swift-i686
+
+    # Copy stlibs
+    rsync -av $input_stdlib/swift-aarch64/swift/ $out_toolchain/usr/lib/swift-aarch64/
+    rsync -av $input_stdlib/swift-armv7/swift/ $out_toolchain/usr/lib/swift-armv7/
+    rsync -av $input_stdlib/swift-x86_64/swift/ $out_toolchain/usr/lib/swift-x86_64/
+    rsync -av $input_stdlib/swift-i686/swift/ $out_toolchain/usr/lib/swift-i686/
+    
+    # Copy corelibs
+    rsync -av $input_lib/swift-aarch64/ $out_toolchain/usr/lib/swift-aarch64/
+    rsync -av $input_lib/swift-armv7/ $out_toolchain/usr/lib/swift-armv7/
+    rsync -av $input_lib/swift-x86_64/ $out_toolchain/usr/lib/swift-x86_64/
+    rsync -av $input_lib/swift-i686/ $out_toolchain/usr/lib/swift-i686/
+
+    # Remove not supported Andorid version libs
+    rm -rf $out_toolchain/usr/lib/*/21
+    rm -rf $out_toolchain/usr/lib/*/22
+    rm -rf $out_toolchain/usr/lib/*/23
+    rm -rf $out_toolchain/usr/lib/*/24
+    rm -rf $out_toolchain/usr/lib/*/25
+    rm -rf $out_toolchain/usr/lib/*/26
+    rm -rf $out_toolchain/usr/lib/*/27
+
+    # Install swift android build tools
     git clone --depth 1 https://github.com/readdle/swift-android-buildtools.git --branch $toolchain_version build-tools
     pushd build-tools
         rm -rf .git .gitignore LICENSE