From 1558cc68ec8f082df3a9ac5857f2236ab56ff5cd Mon Sep 17 00:00:00 2001
From: Pindar Yang <pindaryang@google.com>
Date: Mon, 26 Aug 2024 06:52:12 +0000
Subject: [PATCH] Revert "Support BUILD_FRAMEWORK_COMPATIBILITY_MATRIX for
 soong"

Revert submission 3195743-compatibility_matrix

Reason for revert: Build Break, Bug: 361227456

Reverted changes: /q/submissionid:3195743-compatibility_matrix

Change-Id: Ib89cdc64eb816ca0df872473b1e9a9dfdb08ceee
---
 android/androidmk.go |  1 -
 android/config.go    | 16 ----------------
 android/variable.go  |  5 -----
 3 files changed, 22 deletions(-)

diff --git a/android/androidmk.go b/android/androidmk.go
index 14f8bbfd4..9699ce5b8 100644
--- a/android/androidmk.go
+++ b/android/androidmk.go
@@ -907,7 +907,6 @@ 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 15595dd85..40a73d6e7 100644
--- a/android/config.go
+++ b/android/config.go
@@ -2089,19 +2089,3 @@ 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 97aa80945..a715e0eb0 100644
--- a/android/variable.go
+++ b/android/variable.go
@@ -511,11 +511,6 @@ 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 {