From b1bed0237391f8f11eff77e6582a3266e4162e60 Mon Sep 17 00:00:00 2001 From: Guru Das Srinagesh Date: Wed, 12 Jul 2023 14:29:02 -0700 Subject: [PATCH] ANDROID: build: msm_kernel_la: Fix extra_* logic 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: 8a0b83b56790 ("ANDROID: build: Pass variant-specific bootconfig params to vendor") Change-Id: I944b806e8f65f5b90027d263101b0893586e3eff Signed-off-by: Guru Das Srinagesh --- msm_kernel_la.bzl | 2 +- pineapple.bzl | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/msm_kernel_la.bzl b/msm_kernel_la.bzl index 53121c21fae1..10d19695c098 100644 --- a/msm_kernel_la.bzl +++ b/msm_kernel_la.bzl @@ -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)) diff --git a/pineapple.bzl b/pineapple.bzl index 7db8c3bf70c2..c8fbe6579845 100644 --- a/pineapple.bzl +++ b/pineapple.bzl @@ -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: