Merge "Revert "Always turn on compatible property""

This commit is contained in:
Will Osborn 2020-11-18 11:13:59 +00:00 committed by Gerrit Code Review
commit f0aa3b9527
2 changed files with 5 additions and 0 deletions

View file

@ -1289,6 +1289,10 @@ func (c *config) ProductPrivateSepolicyDirs() []string {
return c.productVariables.ProductPrivateSepolicyDirs return c.productVariables.ProductPrivateSepolicyDirs
} }
func (c *config) ProductCompatibleProperty() bool {
return Bool(c.productVariables.ProductCompatibleProperty)
}
func (c *config) MissingUsesLibraries() []string { func (c *config) MissingUsesLibraries() []string {
return c.productVariables.MissingUsesLibraries return c.productVariables.MissingUsesLibraries
} }

View file

@ -337,6 +337,7 @@ type productVariables struct {
ProductPublicSepolicyDirs []string `json:",omitempty"` ProductPublicSepolicyDirs []string `json:",omitempty"`
ProductPrivateSepolicyDirs []string `json:",omitempty"` ProductPrivateSepolicyDirs []string `json:",omitempty"`
ProductCompatibleProperty *bool `json:",omitempty"`
ProductVndkVersion *string `json:",omitempty"` ProductVndkVersion *string `json:",omitempty"`