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:
Treehugger Robot
2024-09-06 01:03:27 +00:00
committed by Automerger Merge Worker
3 changed files with 22 additions and 0 deletions

View File

@@ -920,6 +920,7 @@ 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))

View File

@@ -2064,3 +2064,19 @@ func (c *config) OdmPropFiles(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
}

View File

@@ -515,6 +515,11 @@ type ProductVariables struct {
OdmPropFiles []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 {