Skip to content

Commit 62b9de1

Browse files
mhegazymhegazy
authored
Remove swift flags for Android (#1012)
Follow up for Android similar to #1010 Downstream run: https://github.com/thebrowsercompany/swift-build/actions/runs/17077606949
1 parent b146801 commit 62b9de1

File tree

1 file changed

+0
-32
lines changed

1 file changed

+0
-32
lines changed

‎.github/workflows/swift-toolchain.yml‎

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -2369,10 +2369,6 @@ jobs:
23692369
if ("${{ matrix.os }}" -eq "Android") {
23702370
# Used by matrix definitions.
23712371
$NDKPATH = cygpath -m ${{ steps.setup-ndk.outputs.ndk-path }}
2372-
$SwiftResourceDir = cygpath -m "${{ github.workspace }}/BinaryCache/Library/Developer/Platforms/Android.platform/Developer/SDKs/Android.sdk/usr/lib/swift"
2373-
$SwiftFlags += " -sdk $NDKPATH/toolchains/llvm/prebuilt/windows-x86_64/sysroot"
2374-
$SwiftFlags += " -resource-dir $SwiftResourceDir"
2375-
$SwiftFlags += " -L $SwiftResourceDir/android"
23762372
}
23772373
23782374
cmake -B ${{ github.workspace }}/BinaryCache/ExperimentalRuntime `
@@ -2423,10 +2419,6 @@ jobs:
24232419
if ("${{ matrix.os }}" -eq "Android") {
24242420
# Used by matrix definitions.
24252421
$NDKPATH = cygpath -m ${{ steps.setup-ndk.outputs.ndk-path }}
2426-
$SwiftResourceDir = cygpath -m "${{ github.workspace }}/BinaryCache/Library/Developer/Platforms/Android.platform/Developer/SDKs/Android.sdk/usr/lib/swift"
2427-
$SwiftFlags += " -sdk $NDKPATH/toolchains/llvm/prebuilt/windows-x86_64/sysroot"
2428-
$SwiftFlags += " -resource-dir $SwiftResourceDir"
2429-
$SwiftFlags += " -L $SwiftResourceDir/android"
24302422
}
24312423
24322424
cmake -B ${{ github.workspace }}/BinaryCache/ExperimentalOverlay `
@@ -2475,10 +2467,6 @@ jobs:
24752467
if ("${{ matrix.os }}" -eq "Android") {
24762468
# Used by matrix definitions.
24772469
$NDKPATH = cygpath -m ${{ steps.setup-ndk.outputs.ndk-path }}
2478-
$SwiftResourceDir = cygpath -m "${{ github.workspace }}/BinaryCache/Library/Developer/Platforms/Android.platform/Developer/SDKs/Android.sdk/usr/lib/swift"
2479-
$SwiftFlags += " -sdk $NDKPATH/toolchains/llvm/prebuilt/windows-x86_64/sysroot"
2480-
$SwiftFlags += " -resource-dir $SwiftResourceDir"
2481-
$SwiftFlags += " -L $SwiftResourceDir/android"
24822470
}
24832471
24842472
cmake -B ${{ github.workspace }}/BinaryCache/ExperimentalStringProcessing `
@@ -2522,10 +2510,6 @@ jobs:
25222510
if ("${{ matrix.os }}" -eq "Android") {
25232511
# Used by matrix definitions.
25242512
$NDKPATH = cygpath -m ${{ steps.setup-ndk.outputs.ndk-path }}
2525-
$SwiftResourceDir = cygpath -m "${{ github.workspace }}/BinaryCache/Library/Developer/Platforms/Android.platform/Developer/SDKs/Android.sdk/usr/lib/swift"
2526-
$SwiftFlags += " -sdk $NDKPATH/toolchains/llvm/prebuilt/windows-x86_64/sysroot"
2527-
$SwiftFlags += " -resource-dir $SwiftResourceDir"
2528-
$SwiftFlags += " -L $SwiftResourceDir/android"
25292513
}
25302514
25312515
cmake -B ${{ github.workspace }}/BinaryCache/ExperimentalSynchronization `
@@ -2570,10 +2554,6 @@ jobs:
25702554
if ("${{ matrix.os }}" -eq "Android") {
25712555
# Used by matrix definitions.
25722556
$NDKPATH = cygpath -m ${{ steps.setup-ndk.outputs.ndk-path }}
2573-
$SwiftResourceDir = cygpath -m "${{ github.workspace }}/BinaryCache/Library/Developer/Platforms/Android.platform/Developer/SDKs/Android.sdk/usr/lib/swift"
2574-
$SwiftFlags += " -sdk $NDKPATH/toolchains/llvm/prebuilt/windows-x86_64/sysroot"
2575-
$SwiftFlags += " -resource-dir $SwiftResourceDir"
2576-
$SwiftFlags += " -L $SwiftResourceDir/android"
25772557
}
25782558
25792559
cmake -B ${{ github.workspace }}/BinaryCache/ExperimentalDistributed `
@@ -2622,10 +2602,6 @@ jobs:
26222602
if ("${{ matrix.os }}" -eq "Android") {
26232603
# Used by matrix definitions.
26242604
$NDKPATH = cygpath -m ${{ steps.setup-ndk.outputs.ndk-path }}
2625-
$SwiftResourceDir = cygpath -m "${{ github.workspace }}/BinaryCache/Library/Developer/Platforms/Android.platform/Developer/SDKs/Android.sdk/usr/lib/swift"
2626-
$SwiftFlags += " -sdk $NDKPATH/toolchains/llvm/prebuilt/windows-x86_64/sysroot"
2627-
$SwiftFlags += " -resource-dir $SwiftResourceDir"
2628-
$SwiftFlags += " -L $SwiftResourceDir/android"
26292605
}
26302606
26312607
cmake -B ${{ github.workspace }}/BinaryCache/ExperimentalObservation `
@@ -2670,10 +2646,6 @@ jobs:
26702646
if ("${{ matrix.os }}" -eq "Android") {
26712647
# Used by matrix definitions.
26722648
$NDKPATH = cygpath -m ${{ steps.setup-ndk.outputs.ndk-path }}
2673-
$SwiftResourceDir = cygpath -m "${{ github.workspace }}/BinaryCache/Library/Developer/Platforms/Android.platform/Developer/SDKs/Android.sdk/usr/lib/swift"
2674-
$SwiftFlags += " -sdk $NDKPATH/toolchains/llvm/prebuilt/windows-x86_64/sysroot"
2675-
$SwiftFlags += " -resource-dir $SwiftResourceDir"
2676-
$SwiftFlags += " -L $SwiftResourceDir/android"
26772649
}
26782650
26792651
cmake -B ${{ github.workspace }}/BinaryCache/ExperimentalVolatile `
@@ -2723,10 +2695,6 @@ jobs:
27232695
if ("${{ matrix.os }}" -eq "Android") {
27242696
# Used by matrix definitions.
27252697
$NDKPATH = cygpath -m ${{ steps.setup-ndk.outputs.ndk-path }}
2726-
$SwiftResourceDir = cygpath -m "${{ github.workspace }}/BinaryCache/Library/Developer/Platforms/Android.platform/Developer/SDKs/Android.sdk/usr/lib/swift"
2727-
$SwiftFlags += " -sdk $NDKPATH/toolchains/llvm/prebuilt/windows-x86_64/sysroot"
2728-
$SwiftFlags += " -resource-dir $SwiftResourceDir"
2729-
$SwiftFlags += " -L $SwiftResourceDir/android"
27302698
}
27312699
27322700
cmake -B ${{ github.workspace }}/BinaryCache/ExperimentalDifferentiation `

0 commit comments

Comments
 (0)