Skip to content

Commit 50dda3a

Browse files
committed
Remove upstreamed release patch on CI and update doc
1 parent c73065a commit 50dda3a

File tree

4 files changed

+3
-342
lines changed

4 files changed

+3
-342
lines changed

.github/workflows/sdks.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -129,13 +129,10 @@ jobs:
129129
git apply -C1 swift-android.patch swift-android-ci.patch
130130
BUILD_FLAG="--foundation-cmake-options=-DCMAKE_SHARED_LINKER_FLAGS=''"
131131
if ${{ matrix.version == 'trunk' }}; then
132-
git apply swift-android-trunk-libdispatch.patch
132+
git apply swift-android-trunk-spawn.patch
133133
BUILD_FLAG+=" --libdispatch-cmake-options=-DCMAKE_SHARED_LINKER_FLAGS=''"
134134
else
135135
git apply swift-android-ci-except-trunk.patch swift-android-except-trunk.patch
136-
if ${{ matrix.version == 'release' }}; then
137-
git apply swift-android-testing-release.patch
138-
fi
139136
fi
140137
141138
perl -pi -e 's%33%24%' $ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/include/execinfo.h

README.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -144,11 +144,9 @@ SDK too, as seen on the CI.
144144

145145
Next, apply two patches from this repo to the Swift source, which make
146146
modifications for NDK 27 and [the Foundation rewrite in Swift 6 that was merged
147-
last summer](https://www.swift.org/blog/foundation-preview-now-available/), and
148-
substitute a string for NDK 27:
147+
last summer](https://www.swift.org/blog/foundation-preview-now-available/):
149148
```
150-
git apply swift-android.patch swift-android-testing-release.patch
151-
perl -pi -e 's%r26%r27%' swift/stdlib/cmake/modules/AddSwiftStdlib.cmake
149+
git apply swift-android.patch swift-android-except-trunk.patch
152150
```
153151

154152
After making sure [needed build tools like python 3, CMake, and ninja](https://github.com/swiftlang/swift/blob/release/6.2/docs/HowToGuides/GettingStarted.md#linux)

swift-android-testing-release.patch

Lines changed: 0 additions & 334 deletions
This file was deleted.
File renamed without changes.

0 commit comments

Comments
 (0)