diff options
| -rw-r--r-- | Android.mk | 18 | ||||
| -rw-r--r-- | partitionmanager.cpp | 36 | ||||
| -rw-r--r-- | variables.h | 4 |
3 files changed, 0 insertions, 58 deletions
diff --git a/Android.mk b/Android.mk index b2c06e851..6ee788927 100644 --- a/Android.mk +++ b/Android.mk @@ -182,24 +182,6 @@ endif ifeq ($(BOARD_HAS_NO_REAL_SDCARD), true) LOCAL_CFLAGS += -DBOARD_HAS_NO_REAL_SDCARD endif -ifneq ($(SP1_NAME),) - LOCAL_CFLAGS += -DSP1_NAME=$(SP1_NAME) -DSP1_BACKUP_METHOD=$(SP1_BACKUP_METHOD) -DSP1_MOUNTABLE=$(SP1_MOUNTABLE) -endif -ifneq ($(SP1_DISPLAY_NAME),) - LOCAL_CFLAGS += -DSP1_DISPLAY_NAME=$(SP1_DISPLAY_NAME) -endif -ifneq ($(SP2_NAME),) - LOCAL_CFLAGS += -DSP2_NAME=$(SP2_NAME) -DSP2_BACKUP_METHOD=$(SP2_BACKUP_METHOD) -DSP2_MOUNTABLE=$(SP2_MOUNTABLE) -endif -ifneq ($(SP2_DISPLAY_NAME),) - LOCAL_CFLAGS += -DSP2_DISPLAY_NAME=$(SP2_DISPLAY_NAME) -endif -ifneq ($(SP3_NAME),) - LOCAL_CFLAGS += -DSP3_NAME=$(SP3_NAME) -DSP3_BACKUP_METHOD=$(SP3_BACKUP_METHOD) -DSP3_MOUNTABLE=$(SP3_MOUNTABLE) -endif -ifneq ($(SP3_DISPLAY_NAME),) - LOCAL_CFLAGS += -DSP3_DISPLAY_NAME=$(SP3_DISPLAY_NAME) -endif ifneq ($(RECOVERY_SDCARD_ON_DATA),) LOCAL_CFLAGS += -DRECOVERY_SDCARD_ON_DATA endif diff --git a/partitionmanager.cpp b/partitionmanager.cpp index 0034feac7..c2ef5f563 100644 --- a/partitionmanager.cpp +++ b/partitionmanager.cpp @@ -1327,24 +1327,6 @@ void TWPartitionManager::Update_System_Details(void) { } else DataManager::SetValue("tw_has_boot_partition", 1); } -#ifdef SP1_NAME - if ((*iter)->Backup_Name == EXPAND(SP1_NAME)) { - int backup_display_size = (int)((*iter)->Backup_Size / 1048576LLU); - DataManager::SetValue(TW_BACKUP_SP1_SIZE, backup_display_size); - } -#endif -#ifdef SP2_NAME - if ((*iter)->Backup_Name == EXPAND(SP2_NAME)) { - int backup_display_size = (int)((*iter)->Backup_Size / 1048576LLU); - DataManager::SetValue(TW_BACKUP_SP2_SIZE, backup_display_size); - } -#endif -#ifdef SP3_NAME - if ((*iter)->Backup_Name == EXPAND(SP3_NAME)) { - int backup_display_size = (int)((*iter)->Backup_Size / 1048576LLU); - DataManager::SetValue(TW_BACKUP_SP3_SIZE, backup_display_size); - } -#endif } else { // Handle unmountable partitions in case we reset defaults if ((*iter)->Mount_Point == "/boot") { @@ -1366,24 +1348,6 @@ void TWPartitionManager::Update_System_Details(void) { } else if ((*iter)->Mount_Point == "/data") { data_size += (int)((*iter)->Backup_Size / 1048576LLU); } -#ifdef SP1_NAME - if ((*iter)->Backup_Name == EXPAND(SP1_NAME)) { - int backup_display_size = (int)((*iter)->Backup_Size / 1048576LLU); - DataManager::SetValue(TW_BACKUP_SP1_SIZE, backup_display_size); - } -#endif -#ifdef SP2_NAME - if ((*iter)->Backup_Name == EXPAND(SP2_NAME)) { - int backup_display_size = (int)((*iter)->Backup_Size / 1048576LLU); - DataManager::SetValue(TW_BACKUP_SP2_SIZE, backup_display_size); - } -#endif -#ifdef SP3_NAME - if ((*iter)->Backup_Name == EXPAND(SP3_NAME)) { - int backup_display_size = (int)((*iter)->Backup_Size / 1048576LLU); - DataManager::SetValue(TW_BACKUP_SP3_SIZE, backup_display_size); - } -#endif } } gui_msg("update_part_details_done=...done"); diff --git a/variables.h b/variables.h index 9de99bdb8..202e27dfe 100644 --- a/variables.h +++ b/variables.h @@ -77,10 +77,6 @@ #define TW_BACKUPS_FOLDER_VAR "tw_backups_folder" -#define TW_SP1_PARTITION_NAME_VAR "tw_sp1_name" -#define TW_SP2_PARTITION_NAME_VAR "tw_sp2_name" -#define TW_SP3_PARTITION_NAME_VAR "tw_sp3_name" - #define TW_SDEXT_SIZE "tw_sdext_size" #define TW_SWAP_SIZE "tw_swap_size" #define TW_SDPART_FILE_SYSTEM "tw_sdpart_file_system" |