From 515dc189bee9711fc2d8463e2cad250149bfdb56 Mon Sep 17 00:00:00 2001 From: John Moon Date: Wed, 18 Jan 2023 17:11:25 -0800 Subject: [PATCH] build: Unify output directory format Currently, the Bazel build output directory format differs from legacy build.sh in that it replaces underscores directory name to hyphens. This behavior is undesirable, so refactor the output directory name logic to be consistent with legacy build.sh: out/msm-kernel-- where words in the target and variant are underscore-delimited. Change-Id: Ia60076dd613fc034888703f10d5dc836b34c317b Signed-off-by: John Moon --- msm_abl.bzl | 5 +++-- msm_common.bzl | 3 +++ msm_dtc.bzl | 5 +++-- msm_kernel_la.bzl | 14 ++++++++------ msm_kernel_vm.bzl | 10 +++++----- 5 files changed, 22 insertions(+), 15 deletions(-) diff --git a/msm_abl.bzl b/msm_abl.bzl index 7ce3603518d8..9f14b621fa49 100644 --- a/msm_abl.bzl +++ b/msm_abl.bzl @@ -1,6 +1,7 @@ load("//build/bazel_common_rules/dist:dist.bzl", "copy_to_dist_dir") +load(":msm_common.bzl", "get_out_dir") -def define_abl_dist(target): +def define_abl_dist(target, msm_target, variant): """Creates ABL distribution target Args: @@ -14,7 +15,7 @@ def define_abl_dist(target): copy_to_dist_dir( name = "{}_abl_dist".format(target), archives = ["{}_abl".format(target)], - dist_dir = "out/msm-kernel-{}/dist".format(target.replace("_", "-")), + dist_dir = "{}/dist".format(get_out_dir(msm_target, variant)), flat = True, wipe_dist_dir = False, log = "info", diff --git a/msm_common.bzl b/msm_common.bzl index 14fa6594e248..ccdfb31af642 100644 --- a/msm_common.bzl +++ b/msm_common.bzl @@ -32,3 +32,6 @@ def gen_config_without_source_lines(build_config, target): ) return ":" + rule_name + +def get_out_dir(msm_target, variant): + return "out/msm-kernel-{}-{}".format(msm_target.replace("-", "_"), variant.replace("-", "_")) diff --git a/msm_dtc.bzl b/msm_dtc.bzl index 09f3687bfd66..963a07acd360 100644 --- a/msm_dtc.bzl +++ b/msm_dtc.bzl @@ -1,6 +1,7 @@ load("//build/bazel_common_rules/dist:dist.bzl", "copy_to_dist_dir") +load(":msm_common.bzl", "get_out_dir") -def define_dtc_dist(target): +def define_dtc_dist(target, msm_target, variant): """Create distribution targets for device tree compiler and associated tools Args: @@ -52,7 +53,7 @@ def define_dtc_dist(target): copy_to_dist_dir( name = "{}_dtc_dist".format(target), archives = [":{}_dtc_tarball".format(target)], - dist_dir = "out/msm-kernel-{}/host".format(target.replace("_", "-")), + dist_dir = "{}/host".format(get_out_dir(msm_target, variant)), flat = True, wipe_dist_dir = True, log = "info", diff --git a/msm_kernel_la.bzl b/msm_kernel_la.bzl index 6bf84658c19b..6f0cc42fc3aa 100644 --- a/msm_kernel_la.bzl +++ b/msm_kernel_la.bzl @@ -20,7 +20,7 @@ load( "get_dtstree", "get_vendor_ramdisk_binaries", ) -load(":msm_common.bzl", "define_top_level_config", "gen_config_without_source_lines") +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") @@ -264,7 +264,7 @@ def _define_image_build( ], ) -def _define_kernel_dist(target, base_kernel): +def _define_kernel_dist(target, msm_target, variant, base_kernel): """Creates distribution targets for kernel builds When Bazel builds everything, the outputs end up buried in `bazel-bin`. @@ -273,10 +273,12 @@ def _define_kernel_dist(target, base_kernel): Args: target: name of main Bazel target (e.g. `kalama_gki`) + msm_target: name of just the platform target (e.g. `kalama`) + variant: name of just the variant (e.g. `gki`) base_kernel: base kernel to fetch artifacts from (e.g. `//common:kernel_aarch64`) """ - dist_dir = "out/msm-kernel-{}/dist".format(target.replace("_", "-")) + dist_dir = get_out_dir(msm_target, variant) + "/dist" msm_dist_targets = [ # do not sort @@ -403,11 +405,11 @@ def define_msm_la( in_tree_module_list = in_tree_module_list, ) - _define_kernel_dist(target, base_kernel) + _define_kernel_dist(target, msm_target, variant, base_kernel) - define_abl_dist(target) + define_abl_dist(target, msm_target, variant) - define_dtc_dist(target) + define_dtc_dist(target, msm_target, variant) define_uapi_library(target) diff --git a/msm_kernel_vm.bzl b/msm_kernel_vm.bzl index cfb1a2f2e7a2..379a4eedf18a 100644 --- a/msm_kernel_vm.bzl +++ b/msm_kernel_vm.bzl @@ -19,7 +19,7 @@ load( "get_dtstree", "get_vendor_ramdisk_binaries", ) -load(":msm_common.bzl", "define_top_level_config", "gen_config_without_source_lines") +load(":msm_common.bzl", "define_top_level_config", "gen_config_without_source_lines", "get_out_dir") load(":msm_dtc.bzl", "define_dtc_dist") load(":image_opts.bzl", "vm_image_opts") load(":uapi_library.bzl", "define_uapi_library") @@ -169,7 +169,7 @@ def _define_kernel_build( kernel_build = ":{}".format(target), ) -def _define_kernel_dist(target): +def _define_kernel_dist(target, msm_target, variant): """Creates distribution targets for kernel builds When Bazel builds everything, the outputs end up buried in `bazel-bin`. @@ -180,7 +180,7 @@ def _define_kernel_dist(target): target: name of main Bazel target (e.g. `kalama_gki`) """ - dist_dir = "out/msm-kernel-{}/dist".format(target.replace("_", "-")) + dist_dir = get_out_dir(msm_target, variant) + "/dist" msm_dist_targets = [ # do not sort @@ -260,9 +260,9 @@ def define_msm_vm( define_compile_commands, ) - _define_kernel_dist(target) + _define_kernel_dist(target, msm_target, variant) - define_dtc_dist(target) + define_dtc_dist(target, msm_target, variant) define_uapi_library(target)