Merge "Revert "ANDROID: build: Add --nocheck_bzl_visibility""

build_with_bazel.py

@@ -147,7 +147,6 @@ class BazelBuilder:
                 "query",
                 "--ui_event_filters=-info",
                 "--noshow_progress",
-                "--nocheck_bzl_visibility",
                 query,
             ]
 
@@ -287,7 +286,6 @@ class BazelBuilder:
         self.user_opts.extend([
             "--user_kmi_symbol_lists=//msm-kernel:android/abi_gki_aarch64_qcom",
             "--ignore_missing_projects",
-            "--nocheck_bzl_visibility",
         ])
 
         if self.dry_run:

msm_kernel_la.bzl

@@ -10,6 +10,8 @@ load(
     "kernel_modules_install",
     "kernel_uapi_headers_cc_library",
     "merged_kernel_uapi_headers",
+    "super_image",
+    "unsparsed_image",
 )
 load(
     "//build:msm_kernel_extensions.bzl",
@@ -25,7 +27,6 @@ load("@bazel_skylib//rules:write_file.bzl", "write_file")
 load(":msm_common.bzl", "define_top_level_config", "gen_config_without_source_lines", "get_out_dir")
 load(":msm_dtc.bzl", "define_dtc_dist")
 load(":msm_abl.bzl", "define_abl_dist")
-load(":super_image.bzl", "super_image")
 load(":avb_boot_img.bzl", "avb_sign_boot_image")
 load(":image_opts.bzl", "boot_image_opts")
 load(":target_variants.bzl", "la_variants")
@@ -272,14 +273,28 @@ def _define_image_build(
         boot_partition_size = int(boot_image_opts.boot_partition_size),
     )
 
-    # Defined separately because `super.img` is not generated by upstream kleaf
+    native.filegroup(
+        name = "{}_system_dlkm_image_file".format(target),
+        srcs = ["{}_images".format(base_kernel)],
+        output_group = "system_dlkm.img",
+    )
+
+    native.filegroup(
+        name = "{}_vendor_dlkm_image_file".format(target),
+        srcs = [":{}_images".format(target)],
+        output_group = "vendor_dlkm.img",
+    )
+
     super_image(
         name = "{}_super_image".format(target),
-        kernel_modules_install = "{}_modules_install".format(target),
-        deps = [
-            "{}_images_system_dlkm_image".format(base_kernel),
-            ":{}_images_vendor_dlkm_image".format(target),
-        ],
+        system_dlkm_image = ":{}_system_dlkm_image_file".format(target),
+        vendor_dlkm_image = ":{}_vendor_dlkm_image_file".format(target),
+    )
+
+    unsparsed_image(
+        name = "{}_unsparsed_image".format(target),
+        src = "{}_super_image".format(target),
+        out = "super_unsparsed.img",
     )
 
 def _define_kernel_dist(
@@ -317,6 +332,7 @@ def _define_kernel_dist(
         ":{}".format(target),
         ":{}_images".format(target),
         ":{}_super_image".format(target),
+        ":{}_unsparsed_image".format(target),
         ":{}_merged_kernel_uapi_headers".format(target),
         ":{}_build_config".format(target),
     ])