diff options
| author | Yifan Hong <elsk@google.com> | 2024-03-12 17:00:40 -0700 |
|---|---|---|
| committer | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2024-03-14 10:39:15 +0000 |
| commit | 154ad62ea3b741d6b5c8c597b79b318fcff14338 (patch) | |
| tree | 9c0f3deb47846688961948b5040b6f0d0e89d069 | |
| parent | 9f14966f7bf974a0b7a40c3421af66a1024e9e1d (diff) | |
| download | build-154ad62ea3b741d6b5c8c597b79b318fcff14338.tar.gz | |
kleaf: add kernel_release to kernel_filegroup
This is to avoid the dependency on GKI artifacts, where
kernel_build does not know about. Later, kernel_build
is responsible for emitting the kernel_filegroup definition.
Bug: 291918087
Bug: 298416462
Change-Id: Icf545dee2233823e94bef1109762ff7607dd47d2
| -rw-r--r-- | kleaf/impl/kernel_filegroup.bzl | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/kleaf/impl/kernel_filegroup.bzl b/kleaf/impl/kernel_filegroup.bzl index b0ca019..bc7e567 100644 --- a/kleaf/impl/kernel_filegroup.bzl +++ b/kleaf/impl/kernel_filegroup.bzl @@ -58,6 +58,11 @@ def _get_toolchain_version_info(ctx, all_deps): def _get_kernel_release(ctx): hermetic_tools = hermetic_toolchain.get(ctx) + kernel_release = ctx.file.kernel_release + if kernel_release: + return kernel_release + + # TODO(b/291918087): Delete legacy code path once users are not present. gki_info = utils.find_file( name = "gki-info.txt", files = ctx.files.gki_artifacts, @@ -292,8 +297,14 @@ default, which in turn sets `collect_unstripped_modules` to `True` by default. "gki_artifacts": attr.label( allow_files = True, doc = """A list of files that were built from the [`gki_artifacts`](#gki_artifacts) target. - The `gki-info.txt` file should be part of that list.""", - mandatory = True, + The `gki-info.txt` file should be part of that list. + + If `kernel_release` is set, this attribute has no effect. + """, + ), + "kernel_release": attr.label( + allow_single_file = True, + doc = "A file providing the kernel release string. This is preferred over `gki_artifacts`.", ), "_debug_print_scripts": attr.label(default = "//build/kernel/kleaf:debug_print_scripts"), "_cache_dir_config_tags": attr.label( |