diff options
| author | Yifan Hong <elsk@google.com> | 2024-04-11 14:36:23 -0700 |
|---|---|---|
| committer | Yifan Hong <elsk@google.com> | 2024-04-12 19:34:38 +0000 |
| commit | 6dc68b85063c0c1cc26bd17671615228c33adb92 (patch) | |
| tree | 475197f0225b4ed619876b5869b348aaa32c3b9a | |
| parent | 6a2347c12ce492750df96c5bd01e0f6d0e797d6b (diff) | |
| download | build-6dc68b85063c0c1cc26bd17671615228c33adb92.tar.gz | |
kleaf: [REFACTOR] Clean up kernel_prebuilt_repo (gki_prebuilts_outs)
Move CI_TARGET_MAPPING.<repo_name>.gki_prebuilts_outs
into download_configs for better generalization.
Test: TH
Bug: 291918087
Change-Id: Ibc2298336e337aea3274579521ae6bda6983a36b
| -rw-r--r-- | kleaf/common_kernels.bzl | 3 | ||||
| -rw-r--r-- | kleaf/impl/kernel_prebuilt_utils.bzl | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/kleaf/common_kernels.bzl b/kleaf/common_kernels.bzl index 236c5a7..7823192 100644 --- a/kleaf/common_kernels.bzl +++ b/kleaf/common_kernels.bzl @@ -972,7 +972,6 @@ def _define_prebuilts(**kwargs): for repo_name, value in CI_TARGET_MAPPING.items(): name = value["target"] - gki_prebuilts_outs = value["gki_prebuilts_outs"] # outputs of _gki_prebuilts deprecate_msg = "Use @{}//{} directly".format(repo_name, name) not_available_msg = "This will no longer be available. File a bug if you rely on this target." @@ -1008,7 +1007,7 @@ def _define_prebuilts(**kwargs): Label("//build/kernel/kleaf:use_signed_prebuilts_is_true"): [name + "_boot_img_archive_signed_downloaded"], "//conditions:default": [name + "_boot_img_archive_downloaded"], }), - outs = gki_prebuilts_outs, + outs = [name + "_gki_prebuilts_outs_downloaded"], deprecation = deprecate_msg, ) diff --git a/kleaf/impl/kernel_prebuilt_utils.bzl b/kleaf/impl/kernel_prebuilt_utils.bzl index 47aca8e..b91edff 100644 --- a/kleaf/impl/kernel_prebuilt_utils.bzl +++ b/kleaf/impl/kernel_prebuilt_utils.bzl @@ -39,7 +39,6 @@ CI_TARGET_MAPPING = { "arch": "arm64", # TODO: Rename this when more architectures are added. "target": "kernel_aarch64", - "gki_prebuilts_outs": GKI_ARTIFACTS_AARCH64_OUTS, "download_configs": [ # - mandatory: If False, download errors are ignored. # - outs_mapping: local_filename -> remote_artifact_fmt @@ -127,6 +126,11 @@ CI_TARGET_MAPPING = { "gki_aarch64_protected_modules": "gki_aarch64_protected_modules", }, }, + { + "target_suffix": "gki_prebuilts_outs", + "mandatory": True, + "outs_mapping": {item: item for item in GKI_ARTIFACTS_AARCH64_OUTS}, + }, ], }, } |