Skip to content

Commit 1655f78

Browse files
authored
Merge pull request #29594 from compnerd/rename-repository
docs: update the repository name (NFC)
2 parents cc3b6a0 + ec46f5b commit 1655f78

File tree

1 file changed

+21
-22
lines changed

1 file changed

+21
-22
lines changed

docs/AndroidBuild.md

+21-22
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ Windows.
1111
1. Configure git to work with Unix file endings
1212
1. Clone `apple/swift-llvm` into a directory named `llvm`
1313
1. Clone `apple/swift-corelibs-libdispatch` into a directory named `swift-corelibs-libdispatch`
14-
1. Clone `apple/swift-corelibs-foundation` into a directory named `swift-corelibs-foundation`G
14+
1. Clone `apple/swift-corelibs-foundation` into a directory named `swift-corelibs-foundation`
1515
1. Clone `apple/swift-corelibs-xctest` into a directory named `swift-corelibs-xctest`
16-
1. Clone `compnerd/swift-windows` into a directory named `swift-windows`
16+
1. Clone `compnerd/swift-build` into a directory named `swift-build`
1717

1818
- Currently, other repositories in the Swift project have not been tested and
1919
may not be supported.
@@ -31,28 +31,27 @@ git clone https://github.com/apple/swift-llvm llvm
3131
git clone https://github.com/apple/swift-corelibs-libdispatch swift-corelibs-libdispatch
3232
git clone https://github.com/apple/swift-corelibs-foundation swift-corelibs-foundation
3333
git clone https://github.com/apple/swift-corelibs-xctest swift-corelibs-xctest
34-
git clone https://github.com/compnerd/swift-windows swift-windows
34+
git clone https://github.com/compnerd/swift-build swift-build
3535
```
3636

3737
## 1. Acquire the lastest toolchain and dependencies
3838

3939
1. Download the toolchain, ICU, libxml2, and curl for android from
40-
[Azure](https://dev.azure.com/compnerd/windows-swift) into `S:\b\a\Library`.
40+
[Azure](https://dev.azure.com/compnerd/swift-build) into `S:\b\a\Library`.
4141

42-
- You can alternatively use `Download-AndroidArtifacts.ps1` from
43-
[compnerd/windows-swift](https://www.github.com/compnerd/windows-swift) under
44-
the utilities directory. This will implicitly setup the requisite directory
45-
structure.
42+
- You can alternatively use `swift-build.py` from
43+
[compnerd/swift-build](https://www.github.com/compnerd/swift-build) under
44+
the utilities directory.
4645

4746
## 1. Configure LLVM
4847

4948
```cmd
5049
md S:\b\a\llvm
5150
cd S:\b\a\llvm
52-
cmake -C S:\swift-windows\cmake\caches\android-armv7.cmake ^
51+
cmake -C S:\swift-build\cmake\caches\android-armv7.cmake ^
5352
-G Ninja ^
5453
-DCMAKE_BUILD_TYPE=Release ^
55-
-DCMAKE_TOOLCHAIN_FILE=S:\swift-windows\cmake\toolchains\android.toolchain.cmake ^
54+
-DCMAKE_TOOLCHAIN_FILE=S:\swift-build\cmake\toolchains\android.toolchain.cmake ^
5655
-DANDROID_ALTERNATE_TOOLCHAIN=S:/b/a/Library/Developer/Toolchains/unknown-Asserts-development.xctoolchain/usr ^
5756
-DLLVM_HOST_TRIPLE=armv7-unknown-linux-androideabi ^
5857
S:/llvm
@@ -66,12 +65,12 @@ cmake -C S:\swift-windows\cmake\caches\android-armv7.cmake
6665
```cmd
6766
md S:\b\a\stdlib
6867
cd S:\b\a\stdlib
69-
cmake -C S:\windows-swift\cmake\caches\android-armv7.cmake ^
70-
-C S:\windows-swift\cmake\caches\swift-stdlib-android-armv7.cmake ^
68+
cmake -C S:\swift-build\cmake\caches\android-armv7.cmake ^
69+
-C S:\swift-build\cmake\caches\swift-stdlib-android-armv7.cmake ^
7170
-G Ninja ^
7271
-DCMAKE_BUILD_TYPE=RelWithDebInfo ^
7372
-DCMAKE_INSTALL_PREFIX=S:/b/a/Library/Developer/Platforms/android.platform/Developer/SDKs/android.sdk/usr ^
74-
-DCMAKE_TOOLCHAIN_FILE=S:\windows-swift\cmake\toolchains\android.toolchain.cmake ^
73+
-DCMAKE_TOOLCHAIN_FILE=S:\swift-build\cmake\toolchains\android.toolchain.cmake ^
7574
-DANDROID_ALTERNATE_TOOLCHAIN=S:/b/a/Library/Developer/Toolchains/unknown-Asserts-development.xctoolchain/usr ^
7675
-DLLVM_DIR=S:/b/a/llvm/lib/cmake/llvm ^
7776
-DSWIFT_NATIVE_SWIFT_TOOLS_PATH=S:/b/a/Library/Developer/Toolchains/unknown-Asserts-development.xctoolchain/usr/bin ^
@@ -92,14 +91,14 @@ ninja install
9291
```cmd
9392
md S:\b\a\libdispatch
9493
cd S:\b\a\libdispatch
95-
cmake -C S:\windows-swift\cmake\caches\android-armv7.cmake ^
94+
cmake -C S:\swift-build\cmake\caches\android-armv7.cmake ^
9695
-DSWIFT_ANDROID_SDK=S:/b/a/Library/Developer/Platforms/android.platform/Developer/SDKs/android.sdk ^
97-
-C S:\windows-swift\cmake\caches\android-armv7-swift-flags.cmake ^
96+
-C S:\swift-build\cmake\caches\android-armv7-swift-flags.cmake ^
9897
-G Ninja ^
9998
-DCMAKE_BUILD_TYPE=RelWithDebInfo ^
10099
-DCMAKE_INSTALL_PREFIX=S:/b/a/Library/Developer/Platforms/android.platform/Developer/SDKs/android.sdk/usr ^
101100
-DCMAKE_SWIFT_COMPILER=S:/b/a/Library/Developer/Toolchains/unknown-Asserts-development.xctoolchain/usr/bin/swiftc.exe ^
102-
-DCMAKE_TOOLCHAIN_FILE=S:\windows-swift\cmake\toolchains\android.toolchain.cmake ^
101+
-DCMAKE_TOOLCHAIN_FILE=S:\swift-build\cmake\toolchains\android.toolchain.cmake ^
103102
-DANDROID_ALTERNATE_TOOLCHAIN=S:/b/a/Library/Developer/Toolchains/unknown-Asserts-development.xctoolchain/usr ^
104103
-DENABLE_SWIFT=YES ^
105104
-DENABLE_TESTING=NO ^
@@ -112,14 +111,14 @@ ninja
112111
```cmd
113112
md S:\b\a\foundation
114113
cd S:\b\a\foundation
115-
cmake -C S:\windows-swift\cmake\caches\android-armv7.cmake ^
114+
cmake -C S:\swift-build\cmake\caches\android-armv7.cmake ^
116115
-DSWIFT_ANDROID_SDK=S:/b/a/Library/Developer/Platforms/android.platform/Developer/SDKs/android.sdk ^
117-
-C S:\windows-swift\cmake\caches\android-armv7-swift-flags.cmake ^
116+
-C S:\swift-build\cmake\caches\android-armv7-swift-flags.cmake ^
118117
-G Ninja ^
119118
-DCMAKE_BUILD_TYPE=RelWithDebInfo ^
120119
-DCMAKE_INSTALL_PREFIX=S:/b/a/Library/Developer/Platforms/android.platform/Developer/SDKs/android.sdk/usr ^
121120
-DCMAKE_SWIFT_COMPILER=S:/b/a/Library/Developer/Toolchains/unknown-Asserts-development.xctoolchain/usr/bin/swiftc.exe ^
122-
-DCMAKE_TOOLCHAIN_FILE=S:\windows-swift\cmake\toolchains\android.toolchain.cmake ^
121+
-DCMAKE_TOOLCHAIN_FILE=S:\swift-build\cmake\toolchains\android.toolchain.cmake ^
123122
-DANDROID_ALTERNATE_TOOLCHAIN=S:/b/a/Library/Developer/Toolchains/unknown-Asserts-development.xctoolchain/usr ^
124123
-DCURL_LIBRARY=S:/b/a/Library/libcurl-development/usr/lib/libcurl.a ^
125124
-DCURL_INCLUDE_DIR=S:/b/a/Library/libcurl-development/usr/include ^
@@ -141,13 +140,13 @@ ninja
141140
```cmd
142141
md S:\b\a\xctest
143142
cd S:\b\a\xctest
144-
cmake -C S:\swift-windows\cmake\caches\android-armv7.cmake ^
145-
-C S:\swift-windows\cmake\caches\android-armv7-swift-flags.cmake ^
143+
cmake -C S:\swift-build\cmake\caches\android-armv7.cmake ^
144+
-C S:\swift-build\cmake\caches\android-armv7-swift-flags.cmake ^
146145
-G Ninja ^
147146
-DCMAKE_BUILD_TYPE=RelWithDebInfo ^
148147
-DCMAKE_INSTALL_PREFIX=S:/b/a/Library/Developer/Platforms/android.platform/Developer/SDKs/android.sdk/usr ^
149148
-DCMAKE_SWIFT_COMPILER=S:/b/a/Library/Developer/Toolchains/unknown-Asserts-development.xctoolchain/usr/bin/swiftc.exe ^
150-
-DCMAKE_TOOLCHAIN_FILE=S:\swift-windows\cmake\toolchains\android.toolchain.cmake ^
149+
-DCMAKE_TOOLCHAIN_FILE=S:\swift-build\cmake\toolchains\android.toolchain.cmake ^
151150
-DANDROID_ALTERNATE_TOOLCHAIN=S:/b/a/Library/Developer/Toolchains/unknown-Asserts-development.xctoolchain/usr ^
152151
-DSWIFT_ANDROID_SDK=S:/b/a/Library/Developer/Platforms/andrfoid.platform/Developer/SDKs/android.sdk ^
153152
-DXCTEST_PATH_TO_FOUNDATION_BUILD=S:/b/a/foundation ^

0 commit comments

Comments
 (0)