Improve 'super' partition description in back-up menu.
For the back-up menu, we can detail what the super partition includes by
aggregating one of BOARD_GOOGLE_DYNAMIC_PARTITIONS_PARTITION_LIST or
BOARD_QTI_DYNAMIC_PARTITIONS_PARTITION_LIST.
We comma-separate the list and capitalise the first letter of each
dynamic partition.
Change-Id: I663eaf4f28b4591293aae21c2dd11f615f625746
diff --git a/Android.mk b/Android.mk
index 56f4926..5b2bdb1 100755
--- a/Android.mk
+++ b/Android.mk
@@ -153,6 +153,15 @@
LOCAL_CFLAGS += -DPRODUCT_USE_DYNAMIC_PARTITIONS=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)
+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')\""
+endif
+
ifeq ($(TW_NO_BIND_SYSTEM),true)
LOCAL_CFLAGS += -DTW_NO_BIND_SYSTEM
endif
diff --git a/partitionmanager.cpp b/partitionmanager.cpp
index 1533bf7..79de55f 100755
--- a/partitionmanager.cpp
+++ b/partitionmanager.cpp
@@ -144,7 +144,7 @@
fstabFile = fopen("/etc/twrp.flags", "rt");
if (fstabFile != NULL) {
- LOGINFO("reading /etc/twrp.flags\n");
+ LOGINFO("Reading /etc/twrp.flags\n");
while (fgets(fstab_line, sizeof(fstab_line), fstabFile) != NULL) {
if (fstab_line[0] != '/')
continue;
@@ -3229,7 +3229,11 @@
superPartition->Mount_Point = "/super";
superPartition->Actual_Block_Device = superPart;
superPartition->Alternate_Block_Device = superPart;
- superPartition->Backup_Display_Name = "super";
+#ifdef BOARD_DYNAMIC_PARTITIONS_PARTITION_LIST
+ superPartition->Backup_Display_Name = "Super (" BOARD_DYNAMIC_PARTITIONS_PARTITION_LIST ")";
+#else
+ superPartition->Backup_Display_Name = "Super";
+#endif
superPartition->Can_Flash_Img = true;
superPartition->Current_File_System = "emmc";
superPartition->Can_Be_Backed_Up = true;