commit f68c7b6299e102aab50a84004f6233088f4a237b
author Will Osborn <willosborn@google.com> Wed Nov 18 12:02:45 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Nov 18 12:02:45 2020 +0000
tree 05e9f3dd1c1466bb55436b93b2c9ce7b47ccd4d1
parent 93e4928d5507b26e9c532c2fd793fb1176cd8ce7
parent 23fde2f34f8a3d9d23fba5384fb14f543f91feb3

Merge "Revert "Always turn on compatible property"" am: f0aa3b9527 am: 23fde2f34f

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1502552

Change-Id: I83896aa80b162fe4d0fafc0ab9edc2bdc849ad61

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"`