commit f0aa3b9527f16833dc970d7007066d0fa2c6fcb1
author Will Osborn <willosborn@google.com> Wed Nov 18 11:13:59 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Nov 18 11:13:59 2020 +0000
tree 0ae7b5d257d8ce8488e74c2bfdc360a56ab70663
parent db892410f7787f38c653e999627b5f4f154ec40e
parent 7d13e5b964fb8ca5572e9ae191d4691dd049eeae

Merge "Revert "Always turn on compatible property""

android/config.go

diff --git a/android/config.go b/android/config.go
index b694bdc..e87a4ac 100644
--- a/android/config.go
+++ b/android/config.go
@@ -1289,6 +1289,10 @@
 	return c.productVariables.ProductPrivateSepolicyDirs
 }
 
+func (c *config) ProductCompatibleProperty() bool {
+	return Bool(c.productVariables.ProductCompatibleProperty)
+}
+
 func (c *config) MissingUsesLibraries() []string {
 	return c.productVariables.MissingUsesLibraries
 }

android/variable.go

diff --git a/android/variable.go b/android/variable.go
index d239eb5..a9a9c87 100644
--- a/android/variable.go
+++ b/android/variable.go
@@ -337,6 +337,7 @@
 
 	ProductPublicSepolicyDirs  []string `json:",omitempty"`
 	ProductPrivateSepolicyDirs []string `json:",omitempty"`
+	ProductCompatibleProperty  *bool    `json:",omitempty"`
 
 	ProductVndkVersion *string `json:",omitempty"`