Android SDK build

Author: marcprux

.github/workflows/pull_request.yml

@@ -35,12 +35,12 @@ jobs:
         run: ./build
 
    android-build:
-     #name: Build Android ${{ matrix.arch }}
-     #strategy:
-       #fail-fast: false
-       #matrix:
-         #arch: [armv7,aarch64,x86_64]
-     name: Build Android SDK
+     name: Build Android ${{ matrix.arch }} SDK
+     strategy:
+       fail-fast: false
+       matrix:
+         arch: [armv7,aarch64,x86_64]
+     #name: Build Android SDK
      runs-on: ubuntu-24.04
      steps:
       - name: Checkout repository
@@ -49,6 +49,6 @@ jobs:
         working-directory: swift-ci/sdks/android
         run: |
           sudo apt install ninja-build
-          #TARGET_ARCHS=${{ matrix.arch }} ./build
-          ./build
+          TARGET_ARCHS=${{ matrix.arch }} ./build
+          #./build
 

swift-ci/sdks/android/build

@@ -77,7 +77,8 @@ pushd ${SDKROOT}/src/swift-project
     #perl -pi -e 's%canImport\(Darwin\) \|\| os\(Android\) \|\| os\(OpenBSD\)%canImport\(Darwin\) || os\(AndroidXXX\) || os\(OpenBSD\)%g' swift-corelibs-foundation/Sources/Foundation/Process.swift
 
     git apply $PATCHDIR/swift-android.patch || true
-    git apply -C1 $PATCHDIR/swift-android-ci.patch || true
+    # swift-android-ci.patch is not needed, since it is only used for llbuild, etc.
+    #git apply -C1 $PATCHDIR/swift-android-ci.patch || true
 
     # need to un-apply libandroid-spawn since we don't need it for API28+
     perl -pi -e 's/MATCHES "Android"/MATCHES "AndroidDISABLED"/g' llbuild/lib/llvm/Support/CMakeLists.txt
@@ -89,8 +90,5 @@ pushd ${SDKROOT}/src/swift-project
     perl -pi -e 's%String\(cString: getpass%\"fake\" //%' swiftpm/Sources/PackageRegistryCommand/PackageRegistryCommand+Auth.swift
 popd
 
-./scripts/build.sh --products-dir ${SDKROOT}/products --source-dir ${SDKROOT}/src --build-dir ${SDKROOT}/build --ndk-home ${ANDROID_NDK_HOME} --android-api ${ANDROID_API} --host-toolchain ${HOST_TOOLCHAIN} --archs $TARGET_ARCHS
-
-# assemble the artifactbundle
-#./scripts/assemble.sh --products-dir ${SDKROOT}/products --build-dir ${SDKROOT}/build --ndk-home ${ANDROID_NDK_HOME} --archs $TARGET_ARCHS
+./scripts/build.sh --products-dir ${SDKROOT}/products --source-dir ${SDKROOT}/src --build-dir ${SDKROOT}/build --ndk-home ${ANDROID_NDK_HOME} --android-api ${ANDROID_API} --host-toolchain ${HOST_TOOLCHAIN} --archs ${TARGET_ARCHS}
 

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

@@ -224,6 +224,11 @@ function run() {
 }
 
 for arch in $archs; do
+    # enable short-circuiting the individual builds
+    if [[ ! -z "$SKIP_ARCH_BUILD" ]]; then
+        continue
+    fi
+
     case $arch in
         armv7) target_host="arm-linux-androideabi"; compiler_target_host="armv7a-linux-androideabi$android_api"; android_abi="armeabi-v7a" ;;
         aarch64) target_host="aarch64-linux-android"; compiler_target_host="$target_host$android_api"; android_abi="arm64-v8a" ;;
@@ -366,3 +371,100 @@ for arch in $archs; do
     header "Completed build for $arch in $sdk_root"
 done
 
+# Now generate the bundle
+header "Bundling SDK"
+
+sdk_name=swift-${swift_version}_static-linux-${static_linux_sdk_version}
+bundle="${sdk_name}.artifactbundle"
+
+rm -rf "${build_dir}/$bundle"
+mkdir -p "${build_dir}/$bundle/$sdk_name/swift-linux-musl"
+
+quiet_pushd ${build_dir}/$bundle
+
+# First the info.json, for SwiftPM
+cat > info.json <<EOF
+{
+  "schemaVersion": "1.0",
+  "artifacts": {
+    "$sdk_name": {
+      "variants": [
+        {
+          "path": "$sdk_name/swift-linux-musl"
+        }
+      ],
+      "version": "0.0.1",
+      "type": "swiftSDK"
+    }
+  }
+}
+EOF
+
+
+cd "$sdk_name/swift-linux-musl"
+
+cat > swift-sdk.json <<EOF
+{
+  "schemaVersion": "4.0",
+  "targetTriples": {
+EOF
+
+first=true
+for arch in $archs; do
+    if [[ "$first" == "true" ]]; then
+        first=false
+    else
+        cat >> swift-sdk.json <<EOF
+    },
+EOF
+    fi
+    cat >> swift-sdk.json <<EOF
+    "${arch}-swift-linux-musl": {
+      "toolsetPaths": [
+        "toolset.json"
+      ],
+      "sdkRootPath": "musl-${musl_version}.sdk/${arch}",
+      "swiftResourcesPath": "musl-${musl_version}.sdk/${arch}/usr/lib/swift_static",
+      "swiftStaticResourcesPath": "musl-${musl_version}.sdk/${arch}/usr/lib/swift_static"
+EOF
+done
+
+cat >> swift-sdk.json <<EOF
+    }
+  }
+}
+EOF
+
+mkdir "musl-${musl_version}.sdk"
+quiet_pushd "musl-${musl_version}.sdk"
+cp -R ${build_dir}/sdk_root/* .
+quiet_popd
+
+mkdir -p swift.xctoolchain/usr/bin
+
+cat > toolset.json <<EOF
+{
+  "rootPath": "swift.xctoolchain/usr/bin",
+  "swiftCompiler" : {
+    "extraCLIOptions" : [
+      "-static-executable",
+      "-static-stdlib"
+    ]
+  },
+  "schemaVersion": "1.0"
+}
+EOF
+
+quiet_popd
+
+#tree ${build_dir}/$bundle
+#tree $products_dir
+
+#header "Outputting compressed bundle"
+
+#quiet_pushd "${build_dir}"
+#mkdir -p "${products_dir}"
+#tar cvzf "${products_dir}/${bundle}.tar.gz" "${bundle}"
+#quiet_popd
+
+