From 3b3aac0088469c6b0985b319028c48fd3b8d7d92 Mon Sep 17 00:00:00 2001
From: Bill Yang <yangbill@google.com>
Date: Thu, 5 Sep 2024 09:22:09 +0000
Subject: [PATCH] Revert "Revert "Support BUILD_FRAMEWORK_COMPATIBILITY_MATRIX
 for..."

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: Ie23bdd343bebbd077553dc25f0bfd13539daf57a
---
 android/androidmk.go |  1 +
 android/config.go    | 16 ++++++++++++++++
 android/variable.go  |  5 +++++
 3 files changed, 22 insertions(+)

diff --git a/android/androidmk.go b/android/androidmk.go
index 9699ce5b8..14f8bbfd4 100644
--- a/android/androidmk.go
+++ b/android/androidmk.go
@@ -907,6 +907,7 @@ func translateAndroidModule(ctx SingletonContext, w io.Writer, moduleInfoJSONs *
 		case "*phony.PhonyRule": // writes phony deps and acts like `.PHONY`
 		case "*selinux.selinuxContextsModule": // license properties written
 		case "*sysprop.syspropLibrary": // license properties written
+		case "*vintf.vintfCompatibilityMatrixRule": // use case like phony
 		default:
 			if !ctx.Config().IsEnvFalse("ANDROID_REQUIRE_LICENSES") {
 				return fmt.Errorf("custom make rules not allowed for %q (%q) module %q", ctx.ModuleType(mod), reflect.TypeOf(mod), ctx.ModuleName(mod))
diff --git a/android/config.go b/android/config.go
index 40a73d6e7..15595dd85 100644
--- a/android/config.go
+++ b/android/config.go
@@ -2089,3 +2089,19 @@ func (c *config) SystemPropFiles(ctx PathContext) Paths {
 func (c *config) EnableUffdGc() string {
 	return String(c.productVariables.EnableUffdGc)
 }
+
+func (c *config) DeviceFrameworkCompatibilityMatrixFile() []string {
+	return c.productVariables.DeviceFrameworkCompatibilityMatrixFile
+}
+
+func (c *config) DeviceProductCompatibilityMatrixFile() []string {
+	return c.productVariables.DeviceProductCompatibilityMatrixFile
+}
+
+func (c *config) BoardAvbEnable() bool {
+	return Bool(c.productVariables.BoardAvbEnable)
+}
+
+func (c *config) BoardAvbSystemAddHashtreeFooterArgs() []string {
+	return c.productVariables.BoardAvbSystemAddHashtreeFooterArgs
+}
diff --git a/android/variable.go b/android/variable.go
index a715e0eb0..97aa80945 100644
--- a/android/variable.go
+++ b/android/variable.go
@@ -511,6 +511,11 @@ type ProductVariables struct {
 	SystemPropFiles []string `json:",omitempty"`
 
 	EnableUffdGc *string `json:",omitempty"`
+
+	BoardAvbEnable                         *bool    `json:",omitempty"`
+	BoardAvbSystemAddHashtreeFooterArgs    []string `json:",omitempty"`
+	DeviceFrameworkCompatibilityMatrixFile []string `json:",omitempty"`
+	DeviceProductCompatibilityMatrixFile   []string `json:",omitempty"`
 }
 
 type PartitionQualifiedVariablesType struct {