diff options
| author | Jordan R Abrahams-Whitehead <ajordanr@google.com> | 2024-05-06 23:22:45 +0000 |
|---|---|---|
| committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2024-05-07 17:31:06 +0000 |
| commit | 9490b3ba035c335def6a0b136b47e34e25efdd1a (patch) | |
| tree | 782ee4acdf00a1461dc8a10d8a51def41907bc8a | |
| parent | e9f846e4a70d4189700bfb715df964210bb40aaa (diff) | |
| download | toolchain-utils-9490b3ba035c335def6a0b136b47e34e25efdd1a.tar.gz | |
llvm_tools: Rm get_llvm_hash dep in stabilize_all_llvm_packages
This replaces the get_upstream_patch.py dependency with the
underlying get_llvm_hash.py library invocations, allowing us
to fully remove get_upstream_patch.py.
BUG=b:339010069
TEST=repo upload
Change-Id: I01df19e5b468226851f687810e96f5f20129b5da
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/toolchain-utils/+/5519694
Reviewed-by: George Burgess <gbiv@chromium.org>
Commit-Queue: Jordan Abrahams-Whitehead <ajordanr@google.com>
Tested-by: Jordan Abrahams-Whitehead <ajordanr@google.com>
| -rw-r--r-- | llvm_tools/stabilize_all_llvm_packages.py | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/llvm_tools/stabilize_all_llvm_packages.py b/llvm_tools/stabilize_all_llvm_packages.py index 0f4f3430..6ecf0a53 100644 --- a/llvm_tools/stabilize_all_llvm_packages.py +++ b/llvm_tools/stabilize_all_llvm_packages.py @@ -24,7 +24,7 @@ import sys from typing import List from llvm_tools import chroot -from llvm_tools import get_upstream_patch +from llvm_tools import get_llvm_hash from llvm_tools import manifest_utils from llvm_tools import patch_utils @@ -87,11 +87,10 @@ def llvm_checked_out_to(checkout_sha: str): def resolve_llvm_sha(llvm_next: bool) -> str: - sys_devel_llvm = ( - CROS_SOURCE_ROOT / "src/third_party/chromiumos-overlay/sys-devel/llvm" - ) - sha = "llvm-next" if llvm_next else "llvm" - return get_upstream_patch.resolve_symbolic_sha(sha, str(sys_devel_llvm)) + hash_obj = get_llvm_hash.LLVMHash() + if llvm_next: + return hash_obj.GetCrOSLLVMNextHash() + return hash_obj.GetCrOSCurrentLLVMHash(CROS_SOURCE_ROOT) def main(argv: List[str]) -> None: |