kleaf: kernel_abi_dist only depends on kernel_build (with_vmlinux).android-u-preview-2_r0.4android-u-preview-2_r0.3android-u-preview-2_r0.2android-u-beta-2_r0.4android-u-beta-2_r0.3android-u-beta-2_r0.2android-u-beta-1_r0.5android-u-beta-1_r0.4android-u-beta-1_r0.3android-t-qpr3-beta-3_r0.5android-t-qpr3-beta-3_r0.4android-t-qpr3-beta-3_r0.3android-t-qpr3-beta-3.1_r0.5android-t-qpr3-beta-3.1_r0.4android-t-qpr3-beta-3.1_r0.3android-t-qpr3-beta-2_r0.5android-t-qpr3-beta-2_r0.4android-t-qpr3-beta-2_r0.3android-t-qpr3-beta-1_r0.5android-t-qpr3-beta-1_r0.4android-t-qpr3-beta-1_r0.3android-t-qpr3-beta-1_r0.1android-t-qpr2-beta-3.2_r0.5android-13.0.0_r0.93android-13.0.0_r0.92android-13.0.0_r0.91android-13.0.0_r0.85android-13.0.0_r0.84android-13.0.0_r0.83android-13.0.0_r0.82android-13.0.0_r0.77android-13.0.0_r0.75android-13.0.0_r0.74android-13.0.0_r0.73android-13.0.0_r0.70android-13.0.0_r0.69android-13.0.0_r0.68android-13.0.0_r0.64android-gs-tangorpro-5.10-android13-d2android-gs-raviole-5.10-u-preview-2android-gs-raviole-5.10-u-beta1android-gs-raviole-5.10-t-qpr3-beta-3android-gs-raviole-5.10-t-qpr3-beta-2android-gs-raviole-5.10-android13-qpr3-beta1android-gs-raviole-5.10-android13-qpr2android-gs-pantah-5.10-u-preview-2android-gs-pantah-5.10-u-beta1android-gs-pantah-5.10-t-qpr3-beta-3android-gs-pantah-5.10-t-qpr3-beta-2android-gs-pantah-5.10-android13-qpr3-beta1android-gs-pantah-5.10-android13-qpr2android-gs-lynx-5.10-android13-qpr2-bandroid-gs-felix-5.10-android13-d3android-gs-bluejay-5.10-u-preview-2android-gs-bluejay-5.10-u-beta1android-gs-bluejay-5.10-t-qpr3-beta-3android-gs-bluejay-5.10-t-qpr3-beta-2android-gs-bluejay-5.10-t-qpr2-beta-3android-gs-bluejay-5.10-android13-qpr3-beta1android-gs-bluejay-5.10-android13-qpr2

For example, kernel_aarch64_abi_dist only depends on
kernel_aarch64_with_vmlinux. This is so that we aren't
building kernel_aarch64 twice, once for ABI artifacts,
the other for dist artifacts.

Bug: 264710236
Test: manual
Change-Id: I47d757fb10544ede2061f34d7591835fdf485b8f

1 files changed, 26 insertions, 13 deletions

diff --git a/kleaf/common_kernels.bzl b/kleaf/common_kernels.bzl
index 6feba85..6c3464d 100644
--- a/kleaf/common_kernels.bzl
+++ b/kleaf/common_kernels.bzl
@@ -522,21 +522,25 @@ def define_common_kernels(
             arch_config = arch_config,
         )
 
-        dist_targets = [
-            name,
-            name + "_uapi_headers",
-            name + "_unstripped_modules_archive",
-            name + "_additional_artifacts",
-            name + "_ddk_artifacts",
-            name + "_modules",
-            name + "_modules_install",
-            # BUILD_GKI_CERTIFICATION_TOOLS=1 for all kernel_build defined here.
-            "//build/kernel:gki_certification_tools",
-        ]
+        _define_gki_additional_targets(
+            kernel_build_name = name + "_with_vmlinux",
+            target_config = target_config,
+            arch_config = arch_config,
+        )
 
         copy_to_dist_dir(
             name = name + "_dist",
-            data = dist_targets,
+            data = [
+                name,
+                name + "_uapi_headers",
+                name + "_unstripped_modules_archive",
+                name + "_additional_artifacts",
+                name + "_ddk_artifacts",
+                name + "_modules",
+                name + "_modules_install",
+                # BUILD_GKI_CERTIFICATION_TOOLS=1 for all kernel_build defined here.
+                "//build/kernel:gki_certification_tools",
+            ],
             flat = True,
             dist_dir = "out/{branch}/dist".format(branch = BRANCH),
             log = "info",
@@ -545,7 +549,16 @@ def define_common_kernels(
         kernel_build_abi_dist(
             name = name + "_abi_dist",
             kernel_build_abi = name,
-            data = dist_targets,
+            data = [
+                name + "_with_vmlinux",
+                name + "_with_vmlinux_uapi_headers",
+                name + "_with_vmlinux_unstripped_modules_archive",
+                name + "_with_vmlinux_additional_artifacts",
+                name + "_with_vmlinux_ddk_artifacts",
+                name + "_with_vmlinux_modules",
+                name + "_with_vmlinux_modules_install",
+                # We don't certify binaries from ABI targets.
+            ],
             flat = True,
             dist_dir = "out_abi/{branch}/dist".format(branch = BRANCH),
             log = "info",