Swift Androd build

Author: marcprux

.github/workflows/pull_request.yml

@@ -39,8 +39,9 @@ jobs:
      strategy:
        fail-fast: false
        matrix:
-         arch: ['x86_64', '']
-     #name: Build Android SDK
+         # build only x86_64 to speed up the validation
+         arch: ['x86_64']
+         #arch: ['x86_64', '']
      runs-on: ubuntu-24.04
      steps:
       - name: Checkout repository

swift-ci/sdks/android/build

@@ -59,34 +59,33 @@ fi
 PATCHDIR=${SDKROOT}/patches
 if [[ ! -d ${PATCHDIR} ]]; then
     git clone https://github.com/finagolfin/swift-android-sdk.git ${PATCHDIR}
-fi
 
-# Apply patches
-# TODO: need to selectively apply patches based on release or not release
-pushd ${SDKROOT}/src/swift-project
-    echo "Applying patches"
+    # TODO: need to selectively apply patches based on release or not release
+    pushd ${SDKROOT}/src/swift-project
+        echo "Applying patches"
 
-    # patch the patch, which seems to only be needed for an API less than 28 
-    # https://github.com/finagolfin/swift-android-sdk/blob/main/swift-android.patch#L110
-    perl -pi -e 's/#if os\(Windows\)/#if os\(Android\)/g' $PATCHDIR/swift-android.patch
+        # patch the patch, which seems to only be needed for an API less than 28 
+        # https://github.com/finagolfin/swift-android-sdk/blob/main/swift-android.patch#L110
+        perl -pi -e 's/#if os\(Windows\)/#if os\(Android\)/g' $PATCHDIR/swift-android.patch
 
-    # remove the need to link in android-execinfo
-    perl -pi -e 's/dispatch android-execinfo/dispatch/g' $PATCHDIR/swift-android.patch
+        # remove the need to link in android-execinfo
+        perl -pi -e 's/dispatch android-execinfo/dispatch/g' $PATCHDIR/swift-android.patch
 
-    git apply -v $PATCHDIR/swift-android.patch
-    # swift-android-ci.patch is not needed, since it is only used for llbuild, etc.
-    #git apply -C1 $PATCHDIR/swift-android-ci.patch
-    git apply -v $PATCHDIR/swift-android-ci-release.patch
-    git apply -v $PATCHDIR/swift-android-testing-release.patch
+        git apply -v $PATCHDIR/swift-android.patch
+        # swift-android-ci.patch is not needed, since it is only used for llbuild, etc.
+        #git apply -C1 $PATCHDIR/swift-android-ci.patch
+        git apply -v $PATCHDIR/swift-android-ci-release.patch
+        git apply -v $PATCHDIR/swift-android-testing-release.patch
 
-    perl -pi -e 's%String\(cString: getpass%\"fake\" //%' swiftpm/Sources/PackageRegistryCommand/PackageRegistryCommand+Auth.swift
-    # disable backtrace() for Android (needs either API33+ or libandroid-execinfo, or to manually add in backtrace backport)
-    perl -pi -e 's/os\(Android\)/os\(AndroidDISABLED\)/g' swift-testing/Sources/Testing/SourceAttribution/Backtrace.swift
+        perl -pi -e 's%String\(cString: getpass%\"fake\" //%' swiftpm/Sources/PackageRegistryCommand/PackageRegistryCommand+Auth.swift
+        # disable backtrace() for Android (needs either API33+ or libandroid-execinfo, or to manually add in backtrace backport)
+        perl -pi -e 's/os\(Android\)/os\(AndroidDISABLED\)/g' swift-testing/Sources/Testing/SourceAttribution/Backtrace.swift
 
-    # 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
-    perl -pi -e 's/ STREQUAL Android\)/ STREQUAL AndroidDISABLED\)/g' swift-corelibs-foundation/Sources/Foundation/CMakeLists.txt
-popd
+        # 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
+        perl -pi -e 's/ STREQUAL Android\)/ STREQUAL AndroidDISABLED\)/g' swift-corelibs-foundation/Sources/Foundation/CMakeLists.txt
+    popd
+fi
 
 ./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}