diff options
| -rw-r--r-- | android/androidmk.go | 1 | ||||
| -rw-r--r-- | android/config.go | 16 | ||||
| -rw-r--r-- | android/variable.go | 5 |
3 files changed, 22 insertions, 0 deletions
diff --git a/android/androidmk.go b/android/androidmk.go index e9df75283..15ab3a721 100644 --- a/android/androidmk.go +++ b/android/androidmk.go @@ -907,6 +907,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)) diff --git a/android/config.go b/android/config.go index d13e5ab3f..d6d76a4a0 100644 --- a/android/config.go +++ b/android/config.go @@ -2053,3 +2053,19 @@ func (c *config) ProductPropFiles(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 +} diff --git a/android/variable.go b/android/variable.go index 4025607d9..c14143748 100644 --- a/android/variable.go +++ b/android/variable.go @@ -513,6 +513,11 @@ type ProductVariables struct { ProductPropFiles []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 { |