Merge "ANDROID: bazel: Update GKI module list"

BUILD.bazel

@@ -12,9 +12,6 @@ package(
     ],
 )
 
-load(":msm_platforms.bzl", "define_msm_platforms")
-define_msm_platforms()
-
 load("@kernel_toolchain_info//:dict.bzl", "BRANCH")
 
 define_common_kernels(branch = BRANCH, target_configs = {
@@ -237,6 +234,10 @@ load(":consolidate.bzl", "define_consolidate")
 
 define_consolidate()
 
+load(":msm_platforms.bzl", "define_msm_platforms")
+
+define_msm_platforms()
+
 # TODO(b/258259749): Convert rockpi4 to mixed build
 kernel_build(
     name = "rockpi4",

kalama.bzl

@@ -94,13 +94,6 @@ def define_kalama():
         # keep sorted
     ]
 
-    # Modules built but not copied to dist directory
-    _kalama_module_implicit_outs = [
-        # keep sorted
-        "drivers/block/zram/zram.ko",
-        "mm/zsmalloc.ko",
-    ]
-
     for variant in la_variants:
         if variant == "consolidate":
             mod_list = _kalama_consolidate_in_tree_modules
@@ -111,5 +104,4 @@ def define_kalama():
             msm_target = target_name,
             variant = variant,
             in_tree_module_list = mod_list,
-            implicit_out_list = _kalama_module_implicit_outs,
         )

msm_kernel_la.bzl

@@ -27,6 +27,7 @@ load(":super_image.bzl", "super_image")
 load(":uapi_library.bzl", "define_uapi_library")
 load(":image_opts.bzl", "boot_image_opts")
 load(":target_variants.bzl", "la_variants")
+load(":modules.bzl", "COMMON_GKI_MODULES_LIST")
 
 
 def _define_build_config(
@@ -111,7 +112,6 @@ def _define_kernel_build(
         target,
         base_kernel,
         in_tree_module_list,
-        implicit_out_list,
         dtb_list,
         dtbo_list,
         dtstree,
@@ -142,7 +142,7 @@ def _define_kernel_build(
     kernel_build(
         name = target,
         module_outs = in_tree_module_list,
-        module_implicit_outs = implicit_out_list,
+        module_implicit_outs = COMMON_GKI_MODULES_LIST,
         outs = out_list,
         build_config = ":{}_build_config".format(target),
         dtstree = dtstree,
@@ -331,7 +331,6 @@ def define_msm_la(
         msm_target,
         variant,
         in_tree_module_list,
-        implicit_out_list = [],
         define_compile_commands = False,
         kmi_enforced = True,
         boot_image_opts = boot_image_opts()):
@@ -341,7 +340,6 @@ def define_msm_la(
       msm_target: name of target platform (e.g. "kalama")
       variant: variant of kernel to build (e.g. "gki")
       in_tree_module_list: list of in-tree modules
-      implicit_out_list: list of in-tree modules which are not copied to the dist directory
       define_compile_commands: boolean determining if `compile_commands.json` should be generated
       kmi_enforced: boolean determining if the KMI contract should be enforced
       boot_image_header_version: boot image header version (for `boot.img`)
@@ -383,7 +381,6 @@ def define_msm_la(
         target,
         base_kernel,
         in_tree_module_list,
-        implicit_out_list,
         dtb_list,
         dtbo_list,
         dtstree,

pineapple.bzl

@@ -231,13 +231,6 @@ def define_pineapple():
         "lib/test_user_copy.ko",
     ]
 
-    # Modules built but not copied to dist directory
-    _pineapple_module_implicit_outs = [
-        # keep sorted
-        "drivers/block/zram/zram.ko",
-        "mm/zsmalloc.ko",
-    ]
-
     for variant in la_variants:
         if variant == "consolidate":
             mod_list = _pineapple_consolidate_in_tree_modules
@@ -248,5 +241,4 @@ def define_pineapple():
             msm_target = target_name,
             variant = variant,
             in_tree_module_list = mod_list,
-            implicit_out_list = _pineapple_module_implicit_outs,
         )