commit a00b187fb96b32a2a58cc37732ead6814b9daa4e
author Ted Bauer <tedbauer@google.com> Tue Nov 26 21:51:18 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Nov 26 21:51:18 2024 +0000
tree d1de3125071fdbdeed1e89467e7f307279071de3
parent 0c64189a39b0cdd70c892bf017af0ad164930e68
parent 7562f08ac9112f11e30745abe32b77178124fac6

Merge "Handle null exception messages in FeatureFlagsImpl.java.template" into main

core/soong_config.mk

diff --git a/core/soong_config.mk b/core/soong_config.mk
index 4683476..f3d1606 100644
--- a/core/soong_config.mk
+++ b/core/soong_config.mk
@@ -446,6 +446,8 @@
   $(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))
+  $(call add_json_list, InternalBootconfig, $(INTERNAL_BOOTCONFIG))
+  $(call add_json_str, InternalBootconfigFile, $(INTERNAL_BOOTCONFIG_FILE))
 
   # Avb (android verified boot) stuff
   $(call add_json_bool, BoardAvbEnable, $(filter true,$(BOARD_AVB_ENABLE)))