diff options
| author | Yifan Hong <elsk@google.com> | 2024-03-19 15:38:33 -0700 |
|---|---|---|
| committer | Yifan Hong <elsk@google.com> | 2024-03-20 00:21:00 -0700 |
| commit | 02a93aca37ee412856ca6113a19d66548cbaf3fa (patch) | |
| tree | 3f1dd9466aea37cd42c11b28a5a135a915bd8b59 | |
| parent | e387fc84d20f5c86867c647c227d8b872da7d8bf (diff) | |
| download | build-02a93aca37ee412856ca6113a19d66548cbaf3fa.tar.gz | |
kleaf: KernelBuildFilegroupDeclInfo.filegroup_srcs uses depset
... to match the documentation.
Also add TODO for cleaning up to_list().
Bug: 330409807
Change-Id: I085f9097750ef3804649cce5105e489e111c7b10
| -rw-r--r-- | kleaf/impl/kernel_build.bzl | 3 | ||||
| -rw-r--r-- | kleaf/impl/kernel_filegroup_declaration.bzl | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/kleaf/impl/kernel_build.bzl b/kleaf/impl/kernel_build.bzl index 6e5b253..90a4576 100644 --- a/kleaf/impl/kernel_build.bzl +++ b/kleaf/impl/kernel_build.bzl @@ -1981,7 +1981,8 @@ def _create_infos( ) filegroup_decl_info = KernelBuildFilegroupDeclInfo( - filegroup_srcs = all_output_files["outs"].values() + all_output_files["module_outs"].values(), + filegroup_srcs = depset(all_output_files["outs"].values() + + all_output_files["module_outs"].values()), module_outs_file = all_module_names_file, modules_staging_archive = modules_staging_archive, toolchain_version_file = toolchain_version_out, diff --git a/kleaf/impl/kernel_filegroup_declaration.bzl b/kleaf/impl/kernel_filegroup_declaration.bzl index ae5a73a..3a5b31a 100644 --- a/kleaf/impl/kernel_filegroup_declaration.bzl +++ b/kleaf/impl/kernel_filegroup_declaration.bzl @@ -89,7 +89,7 @@ kernel_filegroup( ) """.format( name_repr = repr(ctx.attr.kernel_build.label.name), - srcs_repr = files_to_label(info.filegroup_srcs), + srcs_repr = files_to_label(info.filegroup_srcs.to_list()), deps_repr = deps_repr, uapi_headers_target_repr = repr(ctx.attr.kernel_build.label.name + "_uapi_headers"), uapi_headers_repr = file_to_label(kernel_uapi_headers), |