diff --git a/.github/workflows/swift-toolchain.yml b/.github/workflows/swift-toolchain.yml index 7427b82d7..33f8a895a 100644 --- a/.github/workflows/swift-toolchain.yml +++ b/.github/workflows/swift-toolchain.yml @@ -2369,10 +2369,6 @@ jobs: if ("${{ matrix.os }}" -eq "Android") { # Used by matrix definitions. $NDKPATH = cygpath -m ${{ steps.setup-ndk.outputs.ndk-path }} - $SwiftResourceDir = cygpath -m "${{ github.workspace }}/BinaryCache/Library/Developer/Platforms/Android.platform/Developer/SDKs/Android.sdk/usr/lib/swift" - $SwiftFlags += " -sdk $NDKPATH/toolchains/llvm/prebuilt/windows-x86_64/sysroot" - $SwiftFlags += " -resource-dir $SwiftResourceDir" - $SwiftFlags += " -L $SwiftResourceDir/android" } cmake -B ${{ github.workspace }}/BinaryCache/ExperimentalRuntime ` @@ -2423,10 +2419,6 @@ jobs: if ("${{ matrix.os }}" -eq "Android") { # Used by matrix definitions. $NDKPATH = cygpath -m ${{ steps.setup-ndk.outputs.ndk-path }} - $SwiftResourceDir = cygpath -m "${{ github.workspace }}/BinaryCache/Library/Developer/Platforms/Android.platform/Developer/SDKs/Android.sdk/usr/lib/swift" - $SwiftFlags += " -sdk $NDKPATH/toolchains/llvm/prebuilt/windows-x86_64/sysroot" - $SwiftFlags += " -resource-dir $SwiftResourceDir" - $SwiftFlags += " -L $SwiftResourceDir/android" } cmake -B ${{ github.workspace }}/BinaryCache/ExperimentalOverlay ` @@ -2475,10 +2467,6 @@ jobs: if ("${{ matrix.os }}" -eq "Android") { # Used by matrix definitions. $NDKPATH = cygpath -m ${{ steps.setup-ndk.outputs.ndk-path }} - $SwiftResourceDir = cygpath -m "${{ github.workspace }}/BinaryCache/Library/Developer/Platforms/Android.platform/Developer/SDKs/Android.sdk/usr/lib/swift" - $SwiftFlags += " -sdk $NDKPATH/toolchains/llvm/prebuilt/windows-x86_64/sysroot" - $SwiftFlags += " -resource-dir $SwiftResourceDir" - $SwiftFlags += " -L $SwiftResourceDir/android" } cmake -B ${{ github.workspace }}/BinaryCache/ExperimentalStringProcessing ` @@ -2522,10 +2510,6 @@ jobs: if ("${{ matrix.os }}" -eq "Android") { # Used by matrix definitions. $NDKPATH = cygpath -m ${{ steps.setup-ndk.outputs.ndk-path }} - $SwiftResourceDir = cygpath -m "${{ github.workspace }}/BinaryCache/Library/Developer/Platforms/Android.platform/Developer/SDKs/Android.sdk/usr/lib/swift" - $SwiftFlags += " -sdk $NDKPATH/toolchains/llvm/prebuilt/windows-x86_64/sysroot" - $SwiftFlags += " -resource-dir $SwiftResourceDir" - $SwiftFlags += " -L $SwiftResourceDir/android" } cmake -B ${{ github.workspace }}/BinaryCache/ExperimentalSynchronization ` @@ -2570,10 +2554,6 @@ jobs: if ("${{ matrix.os }}" -eq "Android") { # Used by matrix definitions. $NDKPATH = cygpath -m ${{ steps.setup-ndk.outputs.ndk-path }} - $SwiftResourceDir = cygpath -m "${{ github.workspace }}/BinaryCache/Library/Developer/Platforms/Android.platform/Developer/SDKs/Android.sdk/usr/lib/swift" - $SwiftFlags += " -sdk $NDKPATH/toolchains/llvm/prebuilt/windows-x86_64/sysroot" - $SwiftFlags += " -resource-dir $SwiftResourceDir" - $SwiftFlags += " -L $SwiftResourceDir/android" } cmake -B ${{ github.workspace }}/BinaryCache/ExperimentalDistributed ` @@ -2622,10 +2602,6 @@ jobs: if ("${{ matrix.os }}" -eq "Android") { # Used by matrix definitions. $NDKPATH = cygpath -m ${{ steps.setup-ndk.outputs.ndk-path }} - $SwiftResourceDir = cygpath -m "${{ github.workspace }}/BinaryCache/Library/Developer/Platforms/Android.platform/Developer/SDKs/Android.sdk/usr/lib/swift" - $SwiftFlags += " -sdk $NDKPATH/toolchains/llvm/prebuilt/windows-x86_64/sysroot" - $SwiftFlags += " -resource-dir $SwiftResourceDir" - $SwiftFlags += " -L $SwiftResourceDir/android" } cmake -B ${{ github.workspace }}/BinaryCache/ExperimentalObservation ` @@ -2670,10 +2646,6 @@ jobs: if ("${{ matrix.os }}" -eq "Android") { # Used by matrix definitions. $NDKPATH = cygpath -m ${{ steps.setup-ndk.outputs.ndk-path }} - $SwiftResourceDir = cygpath -m "${{ github.workspace }}/BinaryCache/Library/Developer/Platforms/Android.platform/Developer/SDKs/Android.sdk/usr/lib/swift" - $SwiftFlags += " -sdk $NDKPATH/toolchains/llvm/prebuilt/windows-x86_64/sysroot" - $SwiftFlags += " -resource-dir $SwiftResourceDir" - $SwiftFlags += " -L $SwiftResourceDir/android" } cmake -B ${{ github.workspace }}/BinaryCache/ExperimentalVolatile ` @@ -2723,10 +2695,6 @@ jobs: if ("${{ matrix.os }}" -eq "Android") { # Used by matrix definitions. $NDKPATH = cygpath -m ${{ steps.setup-ndk.outputs.ndk-path }} - $SwiftResourceDir = cygpath -m "${{ github.workspace }}/BinaryCache/Library/Developer/Platforms/Android.platform/Developer/SDKs/Android.sdk/usr/lib/swift" - $SwiftFlags += " -sdk $NDKPATH/toolchains/llvm/prebuilt/windows-x86_64/sysroot" - $SwiftFlags += " -resource-dir $SwiftResourceDir" - $SwiftFlags += " -L $SwiftResourceDir/android" } cmake -B ${{ github.workspace }}/BinaryCache/ExperimentalDifferentiation `