commit 03f4ed3415eaf6712c56e871853cfc58ee41371f
author Justin Yun <justinyun@google.com> Thu Feb 06 10:01:25 2020 +0900
committer Justin Yun <justinyun@google.com> Tue Feb 11 04:05:24 2020 +0900
tree 75b19cb843060059d92d3e02d302f5fefd413286
parent 1dffdf84d13e61e8f2e4cd621596dff754dafffe

Do not assign 'false' to PRODUCT_ENFORCE_PRODUCT_PARTITION_INTERFACE

When OVERRIDE_PRODUCT_ENFORCE_PRODUCT_PARTITION_INTERFACE is set to
false, it must not copy the value to
PRODUCT_ENFORCE_PRODUCT_PARTITION_INTERFACE but leave it empty
because Soong always set EnforceProductPartitionInterface to true if
PRODUCT_ENFORCE_PRODUCT_PARTITION_INTERFACE has value.

Bug: 148952638
Test: Build with
      OVERRIDE_PRODUCT_ENFORCE_PRODUCT_PARTITION_INTERFACE=false

Change-Id: I6435157ff993e53669b4244c9be74efbcc84107d

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)