Merge "Do not assign 'false' to PRODUCT_ENFORCE_PRODUCT_PARTITION_INTERFACE"

This commit is contained in:
Treehugger Robot
2020-02-10 21:26:21 +00:00
committed by Gerrit Code Review

View File

@@ -351,7 +351,11 @@ $(KATI_obsolete_var OVERRIDE_PRODUCT_EXTRA_VNDK_VERSIONS \
,Use PRODUCT_EXTRA_VNDK_VERSIONS instead) ,Use PRODUCT_EXTRA_VNDK_VERSIONS instead)
ifdef OVERRIDE_PRODUCT_ENFORCE_PRODUCT_PARTITION_INTERFACE ifdef OVERRIDE_PRODUCT_ENFORCE_PRODUCT_PARTITION_INTERFACE
PRODUCT_ENFORCE_PRODUCT_PARTITION_INTERFACE := $(OVERRIDE_PRODUCT_ENFORCE_PRODUCT_PARTITION_INTERFACE) ifeq (false,$(OVERRIDE_PRODUCT_ENFORCE_PRODUCT_PARTITION_INTERFACE))
PRODUCT_ENFORCE_PRODUCT_PARTITION_INTERFACE :=
else
PRODUCT_ENFORCE_PRODUCT_PARTITION_INTERFACE := $(OVERRIDE_PRODUCT_ENFORCE_PRODUCT_PARTITION_INTERFACE)
endif
else ifeq ($(PRODUCT_SHIPPING_API_LEVEL),) else ifeq ($(PRODUCT_SHIPPING_API_LEVEL),)
# No shipping level defined # No shipping level defined
else ifeq ($(call math_gt,$(PRODUCT_SHIPPING_API_LEVEL),29),true) else ifeq ($(call math_gt,$(PRODUCT_SHIPPING_API_LEVEL),29),true)