android/android_kernel_samsung_sm8650
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build: Unify output directory format

Browse Source 
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-<target>-<variant> where words in the target and
variant are underscore-delimited.

Change-Id: Ia60076dd613fc034888703f10d5dc836b34c317b
Signed-off-by: John Moon <quic_johmoo@quicinc.com>
This commit is contained in:
John Moon 2023-01-18 17:11:25 -08:00
parent 92edb0ce6a
commit 515dc189be
5 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
msm_abl.bzl
View File

@ -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",

3
msm_common.bzl
View File

@ -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("-", "_"))

5
msm_dtc.bzl
View File

@ -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",

14
msm_kernel_la.bzl
View File

@ -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)

10
msm_kernel_vm.bzl
View File

@ -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)