commit 2366366e9f0218efc18ca69434c4416ebb0a5eb3
author Jae Hoon Kim <kimjae@google.com> Tue Aug 27 22:29:46 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Aug 27 22:29:46 2024 +0000
tree f6fc30cfaefad79f454002d98a9983b348849b9c
parent da0dfeb70512057d569f5ccfa87d4255f185c42f
parent c6a9897f883752f74ac7d656b0c42fa6ec41c12e

Merge "core/Makefile: Add desktop update image target hook" into main

core/soong_config.mk

diff --git a/core/soong_config.mk b/core/soong_config.mk
index 14ea2aa..fbfc0f1 100644
--- a/core/soong_config.mk
+++ b/core/soong_config.mk
@@ -356,11 +356,6 @@
 $(call add_json_str, EnableUffdGc, $(_config_enable_uffd_gc))
 _config_enable_uffd_gc :=
 
-$(call add_json_list, DeviceFrameworkCompatibilityMatrixFile, $(DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE))
-$(call add_json_list, DeviceProductCompatibilityMatrixFile, $(DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE))
-$(call add_json_list, BoardAvbSystemAddHashtreeFooterArgs, $(BOARD_AVB_SYSTEM_ADD_HASHTREE_FOOTER_ARGS))
-$(call add_json_bool, BoardAvbEnable, $(filter true,$(BOARD_AVB_ENABLE)))
-
 $(call json_end)
 
 $(file >$(SOONG_VARIABLES).tmp,$(json_contents))