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

ANDROID: build: msm_kernel_le: Move the avb target from the dist target

Browse Source 
avb signing was done in the dist target with commit (9a13ebd43a
"ANDROID: build: msm_kernel_le: Make boot image a chained partition").
Move this from the dist target so that the signing is done correct.

Change-Id: I51a48baaa3ad07773f6a696e75ee4899f9c10277
Signed-off-by: Gokul krishna Krishnakumar <quic_gokukris@quicinc.com>
This commit is contained in:
Gokul krishna Krishnakumar 2023-07-12 16:19:15 -07:00
parent dab6a48ab5
commit c0dc05ca64
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
allyes_images.bzl
View File

@ -1,6 +1,6 @@
load(":avb_boot_img.bzl", "avb_sign_boot_image")
def gen_allyes_files(le_target, msm_dist_targets):
def gen_allyes_files(le_target, target):
""""Build empty vendor_boot/init_boot/super images fr allyes config."""
rule_name = "{}_dummy_files".format(le_target)
native.genrule(
@ -11,8 +11,8 @@ def gen_allyes_files(le_target, msm_dist_targets):
echo 'empty_file' | tee $(OUTS)""",
)
avb_sign_boot_image(
name = "{}_avb_sign_boot_image".format(le_target),
artifacts = "{}_images".format(le_target),
name = "{}_avb_sign_boot_image".format(target),
artifacts = "{}_images".format(target),
avbtool = "//prebuilts/kernel-build-tools:linux-x86/bin/avbtool",
key = "//tools/mkbootimg:gki/testdata/testkey_rsa4096.pem",
props = [
@ -21,5 +21,3 @@ def gen_allyes_files(le_target, msm_dist_targets):
],
boot_partition_size = 0x6000000,
)
msm_dist_targets.append("{}_avb_sign_boot_image".format(le_target))

5
msm_kernel_le.bzl
View File

@ -178,6 +178,7 @@ def _define_kernel_dist(target, msm_target, variant):
":{}_merged_kernel_uapi_headers".format(target),
":{}_build_config".format(target),
":{}_dummy_files".format(le_target),
":{}_avb_sign_boot_image".format(target),
]
copy_to_dist_dir(
@ -209,8 +210,6 @@ def _define_kernel_dist(target, msm_target, variant):
dist_dir = dist_dir,
)
gen_allyes_files(le_target, msm_dist_targets)
def define_msm_le(
msm_target,
variant,
@ -279,4 +278,6 @@ def define_msm_le(
define_dtc_dist(target, msm_target, variant)
gen_allyes_files(le_target, target)
define_extras(target)