Merge "Do not assign 'false' to PRODUCT_ENFORCE_PRODUCT_PARTITION_INTERFACE" am: 10a1d48e31 am: 7bb6cf5277 am: 98bc85f9f9

Change-Id: Icb328d70532d02654132ba9f5711696514f0af8e
This commit is contained in:
Automerger Merge Worker 2020-02-10 22:10:14 +00:00
commit 33e9e4853c
1 changed files with 5 additions and 1 deletions

View File

@ -351,7 +351,11 @@ $(KATI_obsolete_var OVERRIDE_PRODUCT_EXTRA_VNDK_VERSIONS \
,Use PRODUCT_EXTRA_VNDK_VERSIONS instead)
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),)
# No shipping level defined
else ifeq ($(call math_gt,$(PRODUCT_SHIPPING_API_LEVEL),29),true)