commit 1c8d6ea6f8ca1cfbcfa8c80961b6bd67092062a8
author Pindar Yang <pindaryang@google.com> Mon Aug 26 06:52:12 2024 +0000
committer Pindar Yang <pindaryang@google.com> Tue Aug 27 03:23:40 2024 +0000
tree 9140c380ac15552a9a54c1072028c6532b1bc17e
parent c0db374be7b830aeec96c73dc3bcde3bd52f0d79

Revert "Export variable to soong for converting vintf_compatibil..."

Revert submission 3195743-compatibility_matrix

Reason for revert: Build Break, Bug: 361227456

Reverted changes: /q/submissionid:3195743-compatibility_matrix

Change-Id: I7dc43c32d3ada03fd319f47892049b5f33cfcfb4

core/soong_config.mk

diff --git a/core/soong_config.mk b/core/soong_config.mk
index 874cbc3..09ee938 100644
--- a/core/soong_config.mk
+++ b/core/soong_config.mk
@@ -353,11 +353,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))