commit a42e5f976d6d9211b75f5adb216ac02ee5dec7ca
author Yifan Hong <elsk@google.com> Tue Jul 31 13:30:38 2018 -0700
committer Yifan Hong <elsk@google.com> Wed Aug 01 18:29:44 2018 +0000
tree 4bdb1236dbe11f9d3dd90eef7dce11fd67b47bcc
parent d1c308bf406331c2c5cb488b5f8cee44a05e0ed8

Remove USE_LOGICAL_PARTITIONS override

... so that its requirements does not fallback
on the overridden USE_LOGICAL_PARTITIONS, but
PRODUCT_USE_LOGICAL_PARTITIONS.

Test: m superimage -j
Change-Id: Ib14aaf83cc8bd4336125d503d11c69a60566530e

core/config.mk

diff --git a/core/config.mk b/core/config.mk
index b4ddf4b..53718d5 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -925,14 +925,14 @@
 endif
 .KATI_READONLY := PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS
 
-ifeq ($(USE_LOGICAL_PARTITIONS),true)
+ifeq ($(PRODUCT_USE_LOGICAL_PARTITIONS),true)
     requirements := \
         PRODUCT_USE_DYNAMIC_PARTITION_SIZE \
         PRODUCT_BUILD_SUPER_PARTITION \
         PRODUCT_USE_FASTBOOTD \
 
     $(foreach req,$(requirements),$(if $(filter false,$($(req))),\
-        $(error USE_LOGICAL_PARTITIONS requires $(req) to be true)))
+        $(error PRODUCT_USE_LOGICAL_PARTITIONS requires $(req) to be true)))
 
     requirements :=