From 8e70a11ef95d40b8f37513a2c4d8476ac33da53d Mon Sep 17 00:00:00 2001
From: Captain Throwback <captainthrowback@hotmail.com>
Date: Tue, 6 Apr 2021 16:39:45 -0400
Subject: [PATCH] Use BOARD_SUPER_PARTITION_PARTITION_LIST for dynamic list

Simplifies code for retrieving this list rather than using
every possible specified super partition group

Change-Id: I1a3bd8e4b73ce18a176c74a52eb91d25709080f4
---
 Android.mk           | 11 ++---------
 partitionmanager.cpp |  4 ++--
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/Android.mk b/Android.mk
index 0b7853ff..23a3b3f8 100755
--- a/Android.mk
+++ b/Android.mk
@@ -157,15 +157,8 @@ ifeq ($(TW_USES_VENDOR_LIBS),true)
     LOCAL_CFLAGS += -DUSE_VENDOR_LIBS=1
 endif
 
-ifneq ($(BOARD_GOOGLE_DYNAMIC_PARTITIONS_PARTITION_LIST),)
-	BOARD_DYNAMIC_PARTITIONS_PARTITION_LIST := $(BOARD_GOOGLE_DYNAMIC_PARTITIONS_PARTITION_LIST)
-else ifneq ($(BOARD_QTI_DYNAMIC_PARTITIONS_PARTITION_LIST),)
-	BOARD_DYNAMIC_PARTITIONS_PARTITION_LIST := $(BOARD_QTI_DYNAMIC_PARTITIONS_PARTITION_LIST)
-else ifneq ($(BOARD_SAMSUNG_DYNAMIC_PARTITIONS_PARTITION_LIST),)
-	BOARD_DYNAMIC_PARTITIONS_PARTITION_LIST := $(BOARD_SAMSUNG_DYNAMIC_PARTITIONS_PARTITION_LIST)
-endif
-ifneq ($(BOARD_DYNAMIC_PARTITIONS_PARTITION_LIST),)
-	LOCAL_CFLAGS += "-DBOARD_DYNAMIC_PARTITIONS_PARTITION_LIST=\"$(shell echo $(BOARD_DYNAMIC_PARTITIONS_PARTITION_LIST) | sed -r 's/\b(.)/\u\1/g' | sed -e 's/ \+/, /g')\""
+ifneq ($(BOARD_SUPER_PARTITION_PARTITION_LIST),)
+	LOCAL_CFLAGS += "-DBOARD_SUPER_PARTITION_PARTITION_LIST=\"$(shell echo $(BOARD_SUPER_PARTITION_PARTITION_LIST) | sed -r 's/\b(.)/\u\1/g' | sed -e 's/ \+/, /g')\""
 endif
 
 ifeq ($(TW_NO_BIND_SYSTEM),true)
diff --git a/partitionmanager.cpp b/partitionmanager.cpp
index e71f33cc..a4652c6b 100755
--- a/partitionmanager.cpp
+++ b/partitionmanager.cpp
@@ -3393,8 +3393,8 @@ void TWPartitionManager::Setup_Super_Partition() {
 	superPartition->Mount_Point = "/super";
 	superPartition->Actual_Block_Device = superPart;
 	superPartition->Alternate_Block_Device = superPart;
-#ifdef BOARD_DYNAMIC_PARTITIONS_PARTITION_LIST
-	superPartition->Backup_Display_Name = "Super (" BOARD_DYNAMIC_PARTITIONS_PARTITION_LIST ")";
+#ifdef BOARD_SUPER_PARTITION_PARTITION_LIST
+	superPartition->Backup_Display_Name = "Super (" BOARD_SUPER_PARTITION_PARTITION_LIST ")";
 #else
 	superPartition->Backup_Display_Name = "Super";
 #endif