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

ANDROID: build: Fix output directory layout

Browse Source 
With a recent change to the output directory handling from
build_with_bazel.py, some dist directory paths incorrectly used
hyphens instead of underscores.

Fix this issue by mirroring the logic in msm_common.bzl which handles
these paths properly.

Also, run buildifier to fix format of Bazel build files.

Change-Id: Ia82073f059c54f4a7f523c5bd91afdc755c70df1
Signed-off-by: John Moon <quic_johmoo@quicinc.com>
This commit is contained in:
John Moon 2023-07-21 11:55:52 -07:00 committed by Satya Durga Srinivasu Prabhala
parent 72594b5d98
commit c38cee9986
9 changed files with 46 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BUILD.bazel
View File

@ -627,8 +627,8 @@ filegroup(
ddk_headers(
name = "all_headers_unsafe",
hdrs = [
"drivers/gpu/drm/virtio/virtgpu_trace.h",
"drivers/devfreq/governor.h",
"drivers/gpu/drm/virtio/virtgpu_trace.h",
"mm/slab.h",
],
# The list of include directories where source files can #include headers

3
autogvm_lxc.bzl
View File

@ -20,5 +20,6 @@ def define_autogvm_lxc():
boot_image_opts = boot_image_opts(
boot_image_header_version = 2,
base_address = 0x80000000,
page_size = 4096),
page_size = 4096,
),
)

10
build_with_bazel.py
View File

@ -34,8 +34,16 @@ class Target:
if self.out_dir:
out_dir = self.out_dir
else:
# Mirror the logic in msm_common.bzl:get_out_dir()
if "allyes" in self.target:
target_norm = self.target.replace("_", "-")
else:
target_norm = self.target.replace("-", "_")
variant_norm = self.variant.replace("-", "_")
out_dir = DEFAULT_OUT_DIR.format(
workspace = self.workspace, target=self.target, variant=self.variant
workspace = self.workspace, target=target_norm, variant=variant_norm
)
if suffix:

3
gen4auto_lxc.bzl
View File

@ -20,5 +20,6 @@ def define_gen4auto_lxc():
boot_image_opts = boot_image_opts(
boot_image_header_version = 2,
base_address = 0x80000000,
page_size = 4096),
page_size = 4096,
),
)

6
msm_common.bzl
View File

@ -34,7 +34,7 @@ def gen_config_without_source_lines(build_config, target):
return ":" + rule_name
def get_out_dir(msm_target, variant):
if msm_target.find("allyes") != -1:
if "allyes" in msm_target:
return "out/msm-kernel-{}-{}".format(msm_target.replace("_", "-"), variant.replace("-", "_"))
return "out/msm-kernel-{}-{}".format(msm_target.replace("-", "_"), variant.replace("-", "_"))
@ -48,7 +48,7 @@ def define_signing_keys():
$(location //prebuilts/build-tools:linux-x86/bin/openssl) req -new -nodes -utf8 -sha256 -days 36500 \
-batch -x509 -config $(location //msm-kernel:certs/qcom_x509.genkey) \
-outform PEM -out "$@" -keyout "$@"
"""
""",
)
native.genrule(
@ -60,5 +60,5 @@ def define_signing_keys():
$(location //prebuilts/build-tools:linux-x86/bin/openssl) req -new -nodes -utf8 -newkey rsa:1024 -days 36500 \
-batch -x509 -config $(location //msm-kernel:certs/qcom_x509.genkey) \
-outform PEM -out $(location verity_cert.pem) -keyout $(location verity_key.pem)
"""
""",
)

4
msm_kernel_extensions.bzl
View File

@ -7,12 +7,12 @@ def define_top_level_rules():
native.config_setting(
name = "skip_{}_setting".format(skippable),
flag_values = {":skip_{}".format(skippable): "1"}
flag_values = {":skip_{}".format(skippable): "1"},
)
native.config_setting(
name = "include_{}_setting".format(skippable),
flag_values = {":skip_{}".format(skippable): "0"}
flag_values = {":skip_{}".format(skippable): "0"},
)
def define_combined_vm_image(target, variant, vm_size_ext4):

3
pineapple_allyes.bzl
View File

@ -20,5 +20,6 @@ def define_pineapple_allyes():
boot_image_opts = boot_image_opts(
boot_image_header_version = 2,
base_address = 0x80000000,
page_size = 4096),
page_size = 4096,
),
)