From 01c18ba25ca911f68c50ec5727a6f696847f8b7a Mon Sep 17 00:00:00 2001 From: Bill Yang Date: Thu, 5 Sep 2024 09:22:09 +0000 Subject: [PATCH] Revert "Revert "Export variable to soong for converting vintf_co..." Revert submission 3235656-revert-3195743-compatibility_matrix-KLJOLWYIMW Reason for revert: The root cause of the break is already be merged. Related changes: ag/29139095, ag/29139608 Reverted changes: /q/submissionid:3235656-revert-3195743-compatibility_matrix-KLJOLWYIMW Change-Id: I40d9e6c03dd092783e86338a334851a36f5488dd --- core/soong_config.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/core/soong_config.mk b/core/soong_config.mk index 09ee938f73..874cbc3fc2 100644 --- a/core/soong_config.mk +++ b/core/soong_config.mk @@ -353,6 +353,11 @@ _config_enable_uffd_gc := \ $(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))