Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1558cc68 authored by Pindar Yang's avatar Pindar Yang
Browse files

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
parent 66e555c8

android/androidmk.go

+0 −1
Original line number Diff line number Diff line
@@ -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))

android/config.go

+0 −16
Original line number Diff line number Diff line
@@ -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

}

android/variable.go

+0 −5
Original line number Diff line number Diff line
@@ -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 {