Update README after changes to toolchain development process
Bug: http://b/403137505
Change-Id: Ie4b29ce333e51bd7a9ac1034a74d1f1e183e2d83
diff --git a/BUILD.md b/BUILD.md
index 8b53251..45418cd 100644
--- a/BUILD.md
+++ b/BUILD.md
@@ -2,22 +2,29 @@
===============================================
For the latest version of this doc, please make sure to visit:
-[Android Clang/LLVM Toolchain Readme Doc](https://android.googlesource.com/toolchain/llvm_android/+/main/README.md)
+[Android Clang/LLVM Toolchain Readme Doc](https://android.googlesource.com/toolchain/llvm_android/+/mirror-goog-main-llvm-toolchain-source/README.md)
You can also visit the
-[Android Clang/LLVM Prebuilts Readme Doc](https://android.googlesource.com/platform/prebuilts/clang/host/linux-x86/+/main/README.md)
+[Android Clang/LLVM Prebuilts Readme Doc](https://android.googlesource.com/platform/prebuilts/clang/host/linux-x86/+/mirror-goog-main-llvm-toolchain-source/README.md)
for more information about our prebuilt toolchains (and what versions they are based upon).
Build Instructions
------------------
```
+# Googlers
$ mkdir llvm-toolchain && cd llvm-toolchain
-$ repo init -u https://android.googlesource.com/platform/manifest -b llvm-toolchain
-$ repo sync -c
+
+# Use command from go/repo-init/main-llvm-toolchain for googleplex-android host
+# to create and sync the toolchain repo.
+
$ python toolchain/llvm_android/build.py
```
+> Other users: Please wait for new instructions in light of
+> https://source.android.com/docs/whatsnew/site-updates#aosp-changes
+
+
The built toolchain will be installed to `out/install/$HOST/clang-dev`.
#### MLGO
@@ -75,8 +82,12 @@
Rebuild the toolchain with that manifest:
```
+# For Googlers:
$ mkdir llvm-toolchain && cd llvm-toolchain
-$ repo init -u https://android.googlesource.com/platform/manifest -b llvm-toolchain
+
+# Use command from go/repo-init/main-llvm-toolchain for googleplex-android host
+# to create a toolchain repo. No need to sync.
+
$ cp $TOOLCHAIN_DIR/manifest_6317467.xml .repo/manifests
$ repo init -m manifest_6317467.xml
$ repo sync -c
@@ -86,11 +97,14 @@
$ python toolchain/llvm_android/build.py
```
+> Other users: Please wait for new instructions in light of
+> https://source.android.com/docs/whatsnew/site-updates#aosp-changes
+
Compiler Update Steps
---------------------
-This section is out-of-date. The source of truth is moved to
-http://go/android-llvm-update-process
+> This section is out-of-date. The source of truth is moved to
+> http://go/android-llvm-update-process
### Step 1: Update source code
@@ -238,7 +252,7 @@
### Step 7: Switch to the new compiler
All places need to switch to the new compiler are listed in
-https://android.googlesource.com/platform/prebuilts/clang/host/linux-x86/+/main/README.md.
+https://android.googlesource.com/platform/prebuilts/clang/host/linux-x86/+/mirror-goog-main-llvm-toolchain-source/README.md.
The updates in the kernel and NDK are done separately.
diff --git a/README.md b/README.md
index cd829b1..9339dce 100644
--- a/README.md
+++ b/README.md
@@ -2,10 +2,10 @@
> Quick links:
-> * [Android clang build instructions](https://android.googlesource.com/toolchain/llvm_android/+/main/BUILD.md)
-> * [Android clang version history](https://android.googlesource.com/platform/prebuilts/clang/host/linux-x86/+/master/README.md)
+> * [Android clang build instructions](https://android.googlesource.com/toolchain/llvm_android/+/mirror-goog-main-llvm-toolchain-source/BUILD.md)
+> * [Android clang version history](https://android.googlesource.com/platform/prebuilts/clang/host/linux-x86/+/mirror-goog-main-llvm-toolchain-source/README.md)
-Android's clang toolchain is used to build the Android platform, kernel and is also part of the Android NDK. It also builds various tools and projects in the Android ecosystem. See [this](https://android.googlesource.com/platform/prebuilts/clang/host/linux-x86/+/refs/heads/main/README.md) page for a list of current versions used by various projects.
+Android's clang toolchain is used to build the Android platform, kernel and is also part of the Android NDK. It also builds various tools and projects in the Android ecosystem. See [this](https://android.googlesource.com/platform/prebuilts/clang/host/linux-x86/+/refs/heads/mirror-goog-main-llvm-toolchain-source/README.md) page for a list of current versions used by various projects.
Android clang follows a rolling release schedule based on upstream llvm-project's main branch. It **does not** correspond to a numbered llvm-project release branch.
@@ -26,12 +26,12 @@
### Android Clang Development
-Android clang development happens in the `llvm-toolchain` repo branch in AOSP. See [here](https://android.googlesource.com/toolchain/llvm_android/+/main/BUILD.md) for build instructions.
+Android clang development happens in the `main-llvm-toolchain` branch in googleplex-android. See [here](https://android.googlesource.com/toolchain/llvm_android/+/mirror-goog-main-llvm-toolchain-source/BUILD.md) for build instructions.
-[aosp-llvm-toolchain](https://ci.android.com/builds/branches/aosp-llvm-toolchain/grid) is the public CI build of Android clang toolchain.
+[git_main-llvm-toolchain](https://go/ab/git_main-llvm-toolchain) is the internal CI build of Android clang toolchain.
clang binaries from this CI branch are checked into three platform-specific projects:
-* [prebuilts/clang/host/linux-x86](https://android.googlesource.com/platform/prebuilts/clang/host/linux-x86/)
-* [prebuilts/clang/host/darwin-x86](https://android.googlesource.com/platform/prebuilts/clang/host/darwin-x86/)
-* [prebuilts/clang/host/windows-x86](https://android.googlesource.com/platform/prebuilts/clang/host/windows-x86/)
+* [prebuilts/clang/host/linux-x86](https://android.googlesource.com/platform/prebuilts/clang/host/linux-x86/+/refs/heads/mirror-goog-main-llvm-toolchain-source)
+* [prebuilts/clang/host/darwin-x86](https://android.googlesource.com/platform/prebuilts/clang/host/darwin-x86/+/refs/heads/mirror-goog-main-llvm-toolchain-source)
+* [prebuilts/clang/host/windows-x86](https://android.googlesource.com/platform/prebuilts/clang/host/windows-x86/+/refs/heads/mirror-goog-main-llvm-toolchain-source)
