From a42e5f976d6d9211b75f5adb216ac02ee5dec7ca Mon Sep 17 00:00:00 2001
From: Yifan Hong <elsk@google.com>
Date: Tue, 31 Jul 2018 13:30:38 -0700
Subject: [PATCH] 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/Makefile          |  4 ++--
 core/config.mk         |  4 ++--
 core/main.mk           |  2 +-
 core/product_config.mk | 13 +++++--------
 4 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/core/Makefile b/core/Makefile
index 03a5b79420..ae8a30adb4 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -1157,7 +1157,7 @@ ifeq ($(INTERNAL_USERIMAGES_USE_EXT),true)
 INTERNAL_USERIMAGES_DEPS += $(MKE2FS_CONF)
 endif
 
-ifeq (true,$(USE_LOGICAL_PARTITIONS))
+ifeq (true,$(PRODUCT_USE_LOGICAL_PARTITIONS))
 
 ifeq ($(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SUPPORTS_VERITY),true)
   $(error vboot 1.0 doesn't support logical partition)
@@ -1166,7 +1166,7 @@ endif
 # TODO(b/80195851): Should not define BOARD_AVB_SYSTEM_KEY_PATH without
 # BOARD_AVB_SYSTEM_DETACHED_VBMETA.
 
-endif # USE_LOGICAL_PARTITIONS
+endif # PRODUCT_USE_LOGICAL_PARTITIONS
 
 # $(1): the path of the output dictionary file
 # $(2): a subset of "system vendor cache userdata product product_services oem"
diff --git a/core/config.mk b/core/config.mk
index b4ddf4bb11..53718d53d7 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -925,14 +925,14 @@ ifndef PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS
 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 :=
 
diff --git a/core/main.mk b/core/main.mk
index 86b30c81b6..ba082acb18 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -240,7 +240,7 @@ else
 ADDITIONAL_DEFAULT_PROPERTIES += ro.actionable_compatible_property.enabled=${PRODUCT_COMPATIBLE_PROPERTY}
 endif
 
-ADDITIONAL_PRODUCT_PROPERTIES += ro.boot.logical_partitions=$(USE_LOGICAL_PARTITIONS)
+ADDITIONAL_PRODUCT_PROPERTIES += ro.boot.logical_partitions=$(PRODUCT_USE_LOGICAL_PARTITIONS)
 
 # -----------------------------------------------------------------
 ###
diff --git a/core/product_config.mk b/core/product_config.mk
index 93bca41ca9..b5f2896092 100644
--- a/core/product_config.mk
+++ b/core/product_config.mk
@@ -519,21 +519,18 @@ PRODUCT_ACTIONABLE_COMPATIBLE_PROPERTY_DISABLE := \
 PRODUCT_USE_LOGICAL_PARTITIONS := \
     $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_USE_LOGICAL_PARTITIONS))
 .KATI_READONLY := PRODUCT_USE_LOGICAL_PARTITIONS
-ifndef USE_LOGICAL_PARTITIONS
-    USE_LOGICAL_PARTITIONS := $(PRODUCT_USE_LOGICAL_PARTITIONS)
-endif
 
-# All requirements of USE_LOGICAL_PARTITIONS falls back to
-# USE_LOGICAL_PARTITIONS if not defined.
+# All requirements of PRODUCT_USE_LOGICAL_PARTITIONS falls back to
+# PRODUCT_USE_LOGICAL_PARTITIONS if not defined.
 PRODUCT_USE_DYNAMIC_PARTITION_SIZE := $(or \
     $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_USE_DYNAMIC_PARTITION_SIZE)),\
-    $(USE_LOGICAL_PARTITIONS))
+    $(PRODUCT_USE_LOGICAL_PARTITIONS))
 .KATI_READONLY := PRODUCT_USE_DYNAMIC_PARTITION_SIZE
 PRODUCT_BUILD_SUPER_PARTITION := $(or \
     $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_BUILD_SUPER_PARTITION)),\
-    $(USE_LOGICAL_PARTITIONS))
+    $(PRODUCT_USE_LOGICAL_PARTITIONS))
 .KATI_READONLY := PRODUCT_BUILD_SUPER_PARTITION
 PRODUCT_USE_FASTBOOTD := $(or \
     $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_USE_FASTBOOTD)),\
-    $(USE_LOGICAL_PARTITIONS))
+    $(PRODUCT_USE_LOGICAL_PARTITIONS))
 .KATI_READONLY := PRODUCT_USE_FASTBOOTD