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
This commit is contained in:
Captain Throwback
2021-04-06 16:39:45 -04:00
committed by bigbiff
parent dc2cf79bc2
commit 8e70a11ef9
2 changed files with 4 additions and 11 deletions
+2 -9
View File
@@ -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)
+2 -2
View File
@@ -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