diff options
author | Yifan Hong <elsk@google.com> | 2024-03-14 18:43:59 -0700 |
---|---|---|
committer | Yifan Hong <elsk@google.com> | 2024-03-20 12:06:49 -0700 |
commit | c1b63dfd50f665799a6a3bdc37e98200e202e8be (patch) | |
tree | 9648f7e78545d758825c814509cbd83ee9335734 | |
parent | 0f524218a4c0d3f9a3fc8117b30e678820169cf8 (diff) | |
download | build-c1b63dfd50f665799a6a3bdc37e98200e202e8be.tar.gz |
kleaf: Delete internal_ddk_artifacts.
This is now an empty list of files, so delete:
- The output group
- The target under //common:<name>_internal_ddk_artifacts.
Bug: 291918087
Change-Id: I311d04ec930943cc6ad2bf820e3f8e8e5b48e7e5
-rw-r--r-- | kleaf/common_kernels.bzl | 10 | ||||
-rw-r--r-- | kleaf/impl/kernel_build.bzl | 10 |
2 files changed, 0 insertions, 20 deletions
diff --git a/kleaf/common_kernels.bzl b/kleaf/common_kernels.bzl index 3f5776f..c18330b 100644 --- a/kleaf/common_kernels.bzl +++ b/kleaf/common_kernels.bzl @@ -849,21 +849,11 @@ def _define_common_kernel( visibility = ["//visibility:private"], ) - # TODO(b/291918087): Drop after common_kernels no longer use kernel_filegroup. - # These files should already be in kernel_filegroup_declaration. # Everything in name + "_dist" for the DDK. # These are necessary for driver development. Hence they are also added to # kernel_*_dist so they can be downloaded. - # Note: This poke into details of kernel_build! - native.filegroup( - name = name + "_internal_ddk_artifacts", - srcs = [name], - output_group = "internal_ddk_artifacts", - visibility = ["//visibility:private"], - ) ddk_artifacts = [ name + "_filegroup_declaration", - name + "_internal_ddk_artifacts", name + "_unstripped_modules_archive", ] if ddk_headers_archive: diff --git a/kleaf/impl/kernel_build.bzl b/kleaf/impl/kernel_build.bzl index 2f382f0..62c38d3 100644 --- a/kleaf/impl/kernel_build.bzl +++ b/kleaf/impl/kernel_build.bzl @@ -1959,15 +1959,6 @@ def _create_infos( gcno_dir = main_action_ret.gcno_dir, ) - # List of artifacts to be used when creating a kernel_filegroup that mimics this target. - # TODO(b/291918087): Drop after common_kernels no longer use kernel_filegroup. - # These files should already be in kernel_filegroup_declaration. - internal_ddk_artifacts = [ - ] - if module_scripts_archive: - internal_ddk_artifacts.append(module_scripts_archive) - internal_ddk_artifacts_depset = depset(internal_ddk_artifacts) - output_group_kwargs = {} for d in all_output_files.values(): output_group_kwargs.update({name: depset([file]) for name, file in d.items()}) @@ -1977,7 +1968,6 @@ def _create_infos( output_group_kwargs["modules_staging_archive"] = depset([modules_staging_archive]) output_group_kwargs[MODULE_OUTS_FILE_OUTPUT_GROUP] = depset([all_module_names_file]) output_group_kwargs[TOOLCHAIN_VERSION_FILENAME] = depset([toolchain_version_out]) - output_group_kwargs["internal_ddk_artifacts"] = internal_ddk_artifacts_depset output_group_info = OutputGroupInfo(**output_group_kwargs) kbuild_mixed_tree_files = all_output_files["outs"].values() + all_output_files["module_outs"].values() |