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

ANDROID: build: msm_kernel_la: Fix extra_* logic

Browse Source 
A copy-paste error prevented the copying of the generated
extra_bootconfig file even when board_bootconfig_extras was specified if
additionally, board_kernel_cmdline_extras was not specified. Fix this.

In addition, also fix the error of board_bootconfig_extras and
board_kernel_cmdline_extras accumulating values over all the variants
when the intention is for them to only contain values per variant.

Fixes: 8a0b83b567 ("ANDROID: build: Pass variant-specific bootconfig params to vendor")
Change-Id: I944b806e8f65f5b90027d263101b0893586e3eff
Signed-off-by: Guru Das Srinagesh <quic_gurus@quicinc.com>
This commit is contained in:
Guru Das Srinagesh 2023-07-12 14:29:02 -07:00
parent 3cfea26f2f
commit b1bed02373
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
msm_kernel_la.bzl
View File

@ -351,7 +351,7 @@ def _define_kernel_dist(
if board_cmdline_extras:
msm_dist_targets.append("{}_extra_cmdline".format(target))
board_bc_extras = " ".join(boot_image_opts.board_kernel_cmdline_extras)
board_bc_extras = " ".join(boot_image_opts.board_bootconfig_extras)
if board_bc_extras:
msm_dist_targets.append("{}_extra_bootconfig".format(target))

6
pineapple.bzl
View File

@ -282,10 +282,10 @@ def define_pineapple():
"bootconfig",
]
board_kernel_cmdline_extras = []
board_bootconfig_extras = []
for variant in la_variants:
board_kernel_cmdline_extras = []
board_bootconfig_extras = []
if variant == "consolidate":
mod_list = _pineapple_consolidate_in_tree_modules
else: