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

Merge "Revert "Support BUILD_FRAMEWORK_COMPATIBILITY_MATRIX for soong"" into main

Browse Source
This commit is contained in:
Pindar Yang
2024-08-27 03:25:23 +00:00
committed by Gerrit Code Review
parent 17a362a506 1558cc68ec
commit 1282d27291
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

@@ -910,7 +910,6 @@ func translateAndroidModule(ctx SingletonContext, w io.Writer, moduleInfoJSONs *
case "*phony.PhonyRule": // writes phony deps and acts like `.PHONY` case "*phony.PhonyRule": // writes phony deps and acts like `.PHONY`
case "*selinux.selinuxContextsModule": // license properties written case "*selinux.selinuxContextsModule": // license properties written
case "*sysprop.syspropLibrary": // license properties written case "*sysprop.syspropLibrary": // license properties written
case "*vintf.vintfCompatibilityMatrixRule": // use case like phony
default: default:
if !ctx.Config().IsEnvFalse("ANDROID_REQUIRE_LICENSES") { 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)) 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

@@ -2060,19 +2060,3 @@ func (c *config) ProductPropFiles(ctx PathContext) Paths {
func (c *config) EnableUffdGc() string { func (c *config) EnableUffdGc() string {
return String(c.productVariables.EnableUffdGc) 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

@@ -514,11 +514,6 @@ type ProductVariables struct {
ProductPropFiles []string `json:",omitempty"` ProductPropFiles []string `json:",omitempty"`
EnableUffdGc *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 { type PartitionQualifiedVariablesType struct {