StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Support BUILD_FRAMEWORK_COMPATIBILITY_MATRIX for soong"

Browse Source 
Revert submission 3195743-compatibility_matrix

Reason for revert: Build Break, Bug: 361227456

Reverted changes: /q/submissionid:3195743-compatibility_matrix

Change-Id: Ib89cdc64eb816ca0df872473b1e9a9dfdb08ceee
This commit is contained in:
Pindar Yang
2024-08-26 06:52:12 +00:00
parent 66e555c8c7
commit 1558cc68ec
3 changed files with 0 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
android/androidmk.go
View File

@@ -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))

16
android/config.go
View File

@@ -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
}

5
android/variable.go
View File

@@ -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 {