Revert rust change
https://github.com/rust-lang/rust/pull/144086 is causing crashes in ThinLTO builds, temporarily revert while we figure out what to do.
Bug: 441524277
Change-Id: I8f68aeac9d582678443376c9195475e79b49c233
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6896856
Reviewed-by: Zequan Wu <zequanwu@google.com>
Commit-Queue: Arthur Eubanks <aeubanks@google.com>
Cr-Commit-Position: refs/heads/main@{#1508072}
NOKEYCHECK=True
GitOrigin-RevId: 093b80a718d1f4137a33889eb90a158997a79c1d
diff --git a/build_rust.py b/build_rust.py
index 7880a4e..2a56d02 100755
--- a/build_rust.py
+++ b/build_rust.py
@@ -57,8 +57,8 @@
from build import (AddCMakeToPath, AddZlibToPath, CheckoutGitRepo, CopyFile,
DownloadDebianSysroot, GetLibXml2Dirs, GitCherryPick,
- LLVM_DIR, IsGitAncestorToHead, LLVM_BUILD_TOOLS_DIR,
- RunCommand)
+ GitRevert, LLVM_DIR, IsGitAncestorToHead,
+ LLVM_BUILD_TOOLS_DIR, RunCommand)
from update import (CHROMIUM_DIR, DownloadAndUnpack, EnsureDirExists,
GetDefaultHostOs, RmTree, WriteStampFile, UpdatePackage)
@@ -622,6 +622,9 @@
# with `GitMoveSubmoduleBranch()`.
#############################
+ # TODO(https://crbug.com/441524277): remove revert after resolving issue upstream
+ GitRevert(RUST_SRC_DIR, '8ea3b093819aabd92a605b42989341da0c97c0d6')
+
print('Finished applying cherry-picks.')