PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve 'super' partition description in back-up menu.

Browse Source 
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
This commit is contained in:
Ian Macdonald
2020-09-29 20:47:31 +02:00
committed by bigbiff
parent 2a1e375076
commit 160e8d3955
2 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Android.mk
+9
View File
@@ -153,6 +153,15 @@ ifeq ($(PRODUCT_USE_DYNAMIC_PARTITIONS),true)
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
partitionmanager.cpp
+6 -2
View File
@@ -144,7 +144,7 @@ int TWPartitionManager::Process_Fstab(string Fstab_Filename, bool Display_Error)
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 @@ void TWPartitionManager::Setup_Super_Partition() {
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;