Merge "Revert "Support BUILD_FRAMEWORK_COMPATIBILITY_MATRIX for soong"" into main
diff --git a/android/androidmk.go b/android/androidmk.go
index f6f4889..9cad697 100644
--- a/android/androidmk.go
+++ b/android/androidmk.go
@@ -910,7 +910,6 @@
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 77c5b34..2f6ade7 100644
--- a/android/config.go
+++ b/android/config.go
@@ -2060,19 +2060,3 @@
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 c8744ed..10205e3 100644
--- a/android/variable.go
+++ b/android/variable.go
@@ -514,11 +514,6 @@
ProductPropFiles []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 {