Revert "Always turn on compatible property"
This reverts commit 9994e96c7d5833c6619a5b089dcf288fcbe7ee97.
Reason for revert: broken targets on the internal branch
Change-Id: Ic440fb1ca6ae5774a1d51e8fe1f3724426511841
diff --git a/core/main.mk b/core/main.mk
index 60f0bfa..9b19761 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -193,7 +193,11 @@
# Sets ro.actionable_compatible_property.enabled to know on runtime whether the
# allowed list of actionable compatible properties is enabled or not.
-ADDITIONAL_SYSTEM_PROPERTIES += ro.actionable_compatible_property.enabled=true
+ifeq ($(PRODUCT_ACTIONABLE_COMPATIBLE_PROPERTY_DISABLE),true)
+ADDITIONAL_SYSTEM_PROPERTIES += ro.actionable_compatible_property.enabled=false
+else
+ADDITIONAL_SYSTEM_PROPERTIES += ro.actionable_compatible_property.enabled=${PRODUCT_COMPATIBLE_PROPERTY}
+endif
# Add the system server compiler filter if they are specified for the product.
ifneq (,$(PRODUCT_SYSTEM_SERVER_COMPILER_FILTER))