summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Inseob Kim <inseob@google.com> 2020-11-18 11:04:27 +0000
committer Inseob Kim <inseob@google.com> 2020-11-18 11:04:27 +0000
commit7d13e5b964fb8ca5572e9ae191d4691dd049eeae (patch)
treea7a997c6f7cc5fe1ac585d4fd00ad395ada8daff
parentf6d606ebea3334bdf00148639edcc8378c3b8861 (diff)
Revert "Always turn on compatible property"
This reverts commit f6d606ebea3334bdf00148639edcc8378c3b8861. Reason for revert: broken targets on the internal branch Change-Id: I948280e2072789a2ee20e7fe4844c667f58b5182
-rw-r--r--android/config.go4
-rw-r--r--android/variable.go1
2 files changed, 5 insertions, 0 deletions
diff --git a/android/config.go b/android/config.go
index 75e9fd5fa..8df65f720 100644
--- a/android/config.go
+++ b/android/config.go
@@ -1247,6 +1247,10 @@ func (c *config) ProductPrivateSepolicyDirs() []string {
return c.productVariables.ProductPrivateSepolicyDirs
}
+func (c *config) ProductCompatibleProperty() bool {
+ return Bool(c.productVariables.ProductCompatibleProperty)
+}
+
func (c *config) MissingUsesLibraries() []string {
return c.productVariables.MissingUsesLibraries
}
diff --git a/android/variable.go b/android/variable.go
index afad56862..53f081e8c 100644
--- a/android/variable.go
+++ b/android/variable.go
@@ -331,6 +331,7 @@ type productVariables struct {
ProductPublicSepolicyDirs []string `json:",omitempty"`
ProductPrivateSepolicyDirs []string `json:",omitempty"`
+ ProductCompatibleProperty *bool `json:",omitempty"`
ProductVndkVersion *string `json:",omitempty"`