commit 5f5c4db8a3514c604561adb8e81f1ca14aec1216
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Thu Nov 21 23:39:32 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Nov 21 23:39:32 2024 +0000
tree 35cbfa99bbafeb3621ebe4503cb331a6d5ae7502
parent 9341696245b20f75da8acad00b0469fc2a4ce821
parent 45b421e1d917c06aedee744b4775c0196f31f01b

Merge "Export INTERNAL_KERNEL_CMDLINE to Soong" into main am: 45b421e1d9

Original change: https://android-review.googlesource.com/c/platform/build/+/3371057

Change-Id: I1705927cc736249dbb4f5419d0bf81c25ec20a79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

core/soong_config.mk

diff --git a/core/soong_config.mk b/core/soong_config.mk
index 081aa20..4683476 100644
--- a/core/soong_config.mk
+++ b/core/soong_config.mk
@@ -445,6 +445,7 @@
   $(call add_json_str, InitBootSecurityPatch, $(INIT_BOOT_SECURITY_PATCH))
   $(call add_json_str, VendorSecurityPatch, $(VENDOR_SECURITY_PATCH))
   $(call add_json_bool, BoardIncludeDtbInBootimg, $(BOARD_INCLUDE_DTB_IN_BOOTIMG))
+  $(call add_json_list, InternalKernelCmdline, $(INTERNAL_KERNEL_CMDLINE))
 
   # Avb (android verified boot) stuff
   $(call add_json_bool, BoardAvbEnable, $(filter true,$(BOARD_AVB_ENABLE)))