Merge "Revert "Revert "Support BUILD_FRAMEWORK_COMPATIBILITY_MATRIX for..."" into main am: 4301e29a02
am: 55976063db
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3256523 Change-Id: I22599f143fd908ec3ac344fa57fd7373f62b179e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -920,6 +920,7 @@ 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))
|
||||||
|
@@ -2064,3 +2064,19 @@ func (c *config) OdmPropFiles(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
|
||||||
|
}
|
||||||
|
@@ -515,6 +515,11 @@ type ProductVariables struct {
|
|||||||
OdmPropFiles []string `json:",omitempty"`
|
OdmPropFiles []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 {
|
||||||
|
Reference in New Issue
Block a user