commit 9ee13fbc93d1d51c3ffaa1ab63297d61aba07417
author Priyanka Advani (xWF) <padvani@google.com> Wed Nov 06 18:16:26 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Nov 06 18:16:26 2024 +0000
tree 7d50ea6598e2d9a5d4dce6256ea318b7ad711bf2
parent 62304e16a863cf6ab9b94dcc510de6f5d35236e9
parent cc5aa13bd3837eb4cf1f07ae3993a0114fb4bec1

Merge changes from topic "revert-3332613-system_aconfigd_rust_binary-EBVLQXTIPR" into main

* changes:
  Revert "add aconfigd-system binary to be installed on /system"
  Revert "add aconfigd-system binary and libaconfigd_system librar..."

core/soong_config.mk

diff --git a/core/soong_config.mk b/core/soong_config.mk
index 5bdf0f1..c0641de 100644
--- a/core/soong_config.mk
+++ b/core/soong_config.mk
@@ -441,6 +441,10 @@
   $(call add_json_bool, BuildingSystemDlkmImage,               $(BUILDING_SYSTEM_DLKM_IMAGE))
   $(call add_json_list, SystemKernelModules, $(BOARD_SYSTEM_KERNEL_MODULES))
 
+  # Used to generate /vendor/build.prop
+  $(call add_json_list, BoardInfoFiles, $(if $(TARGET_BOARD_INFO_FILES),$(TARGET_BOARD_INFO_FILES),$(firstword $(TARGET_BOARD_INFO_FILE) $(wildcard $(TARGET_DEVICE_DIR)/board-info.txt))))
+  $(call add_json_str, BootLoaderBoardName, $(TARGET_BOOTLOADER_BOARD_NAME))
+
   $(call add_json_map, ProductCopyFiles)
   $(foreach pair,$(PRODUCT_COPY_FILES),\
     $(call add_json_str,$(word 1,$(subst :, ,$(pair))),$(word 2,$(subst :, ,$(pair)))))