kleaf: common_kernels: drop files already included in filegroup_def_archive.

The kernel_aarch64_filegroup_def.tar.gz already
contains many of the necessary files for kernel_filegroup.
Drop them from kernel_aarch64_ddk_artifacts because
they are not used by the kernel_filegroup emitted
by kernel_build.

Test: TH
Bug: 291918087
Change-Id: I5f798f549b88cb54f87b14a7bc1af6f338dd33f8

3 files changed, 3 insertions, 27 deletions

diff --git a/kleaf/common_kernels.bzl b/kleaf/common_kernels.bzl
index f40fe9c..daf4dc0 100644
--- a/kleaf/common_kernels.bzl
+++ b/kleaf/common_kernels.bzl
@@ -866,9 +866,8 @@ def _define_common_kernel(
     )
     ddk_artifacts = [
         name + "_filegroup_declaration",
-        name + "_modules_prepare",
-        name + "_modules_staging_archive",
         name + "_internal_ddk_artifacts",
+        name + "_unstripped_modules_archive",
     ]
     if ddk_headers_archive:
         ddk_artifacts.append(ddk_headers_archive)
@@ -880,7 +879,6 @@ def _define_common_kernel(
     dist_targets = [
         name,
         name + "_uapi_headers",
-        name + "_unstripped_modules_archive",
         name + "_additional_artifacts",
         name + "_ddk_artifacts",
         name + "_modules",
diff --git a/kleaf/impl/kernel_build.bzl b/kleaf/impl/kernel_build.bzl
index 81a5a79..6057268 100644
--- a/kleaf/impl/kernel_build.bzl
+++ b/kleaf/impl/kernel_build.bzl
@@ -42,7 +42,6 @@ load(
     "KernelBuildUapiInfo",
     "KernelBuildUnameInfo",
     "KernelCmdsInfo",
-    "KernelConfigArchiveInfo",
     "KernelEnvAndOutputsInfo",
     "KernelEnvAttrInfo",
     "KernelEnvMakeGoalsInfo",
@@ -1944,21 +1943,12 @@ def _create_infos(
     # TODO(b/291918087): Drop after common_kernels no longer use kernel_filegroup.
     #   These files should already be in kernel_filegroup_declaration.
     internal_ddk_artifacts = [
-        all_module_names_file,
     ]
     if module_scripts_archive:
         internal_ddk_artifacts.append(module_scripts_archive)
     if internal_outs_archive:
         internal_ddk_artifacts.append(internal_outs_archive)
-    if ctx.file.src_protected_modules_list:
-        internal_ddk_artifacts.append(ctx.file.src_protected_modules_list)
-    transitive_internal_ddk_artifacts = [
-        ctx.attr.config[KernelConfigArchiveInfo].files,
-    ]
-    internal_ddk_artifacts_depset = depset(
-        internal_ddk_artifacts,
-        transitive = transitive_internal_ddk_artifacts,
-    )
+    internal_ddk_artifacts_depset = depset(internal_ddk_artifacts)
 
     output_group_kwargs = {}
     for d in all_output_files.values():
diff --git a/kleaf/impl/kernel_prebuilt_utils.bzl b/kleaf/impl/kernel_prebuilt_utils.bzl
index 82028c6..e0cf13d 100644
--- a/kleaf/impl/kernel_prebuilt_utils.bzl
+++ b/kleaf/impl/kernel_prebuilt_utils.bzl
@@ -22,8 +22,6 @@ load(
     ":constants.bzl",
     "FILEGROUP_DEF_ARCHIVE_SUFFIX",
     "GKI_ARTIFACTS_AARCH64_OUTS",
-    "MODULES_STAGING_ARCHIVE",
-    "MODULE_OUTS_FILE_SUFFIX",
     "SYSTEM_DLKM_COMMON_OUTS",
     "TOOLCHAIN_VERSION_FILENAME",
     "UNSTRIPPED_MODULES_ARCHIVE",
@@ -93,12 +91,6 @@ GKI_DOWNLOAD_CONFIGS = [
         "target_suffix": "ddk_artifacts",
         "outs": [
             "kernel_aarch64" + FILEGROUP_DEF_ARCHIVE_SUFFIX,
-            # TODO(b/291918087): Drop after common_kernels no longer use kernel_filegroup.
-            #   These files should already be in kernel_filegroup_declaration.
-            # _modules_prepare
-            "modules_prepare_outdir.tar.gz",
-            # _modules_staging_archive
-            MODULES_STAGING_ARCHIVE,
         ],
     },
     {
@@ -121,11 +113,7 @@ CI_TARGET_MAPPING = {
         "arch": "arm64",
         # TODO: Rename this when more architectures are added.
         "target": "kernel_aarch64",
-        "outs": DEFAULT_GKI_OUTS + [
-            # TODO(b/291918087): Drop after common_kernels no longer use kernel_filegroup.
-            #   These files should already be in kernel_filegroup_declaration.
-            "kernel_aarch64" + MODULE_OUTS_FILE_SUFFIX,
-        ],
+        "outs": DEFAULT_GKI_OUTS,
         "protected_modules": "gki_aarch64_protected_modules",
         "gki_prebuilts_outs": GKI_ARTIFACTS_AARCH64_OUTS,
     },