From 7d13e5b964fb8ca5572e9ae191d4691dd049eeae Mon Sep 17 00:00:00 2001
From: Inseob Kim <inseob@google.com>
Date: Wed, 18 Nov 2020 11:04:27 +0000
Subject: [PATCH] Revert "Always turn on compatible property"

This reverts commit f6d606ebea3334bdf00148639edcc8378c3b8861.

Reason for revert: broken targets on the internal branch

Change-Id: I948280e2072789a2ee20e7fe4844c667f58b5182
---
 android/config.go   | 4 ++++
 android/variable.go | 1 +
 2 files changed, 5 insertions(+)

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