commit 98bc85f9f9c426892183a0fc7dc587962b9a9f67
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Feb 10 21:59:12 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Feb 10 21:59:12 2020 +0000
tree 97950413112ca46897bcd7aefa5ceec2205b23a4
parent 7d1ed118eb728f8f39281258b7457b23fd6da956
parent 7bb6cf5277878fb29cbc6c328699365dd14a4bdb

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

Change-Id: I2d7b97a11720436e9c955c85fbb84dc2fd0cbcfa

core/product_config.mk

diff --git a/core/product_config.mk b/core/product_config.mk
index 47492c2e..eba72e4 100644
--- a/core/product_config.mk
+++ b/core/product_config.mk
@@ -351,7 +351,11 @@
     ,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)