AOSP10 TWRP Merge: fix conflicts and update libraries needed
This allows flame to boot TWRP. Still will need to work on
super partition for vendor and system access.
The plan will be to cherry-pick any updates to android-9.0
through gerrit.twrp.me to this branch as a WIP.
diff --git a/partitionmanager.cpp b/partitionmanager.cpp
index b265469..19c527f 100755
--- a/partitionmanager.cpp
+++ b/partitionmanager.cpp
@@ -515,7 +515,7 @@
bool found = false;
string Local_Path = TWFunc::Get_Root_Path(Path);
- if (Local_Path == "/tmp" || Local_Path == "/" || Local_Path == "/etc")
+ if (Local_Path == "/tmp" || Local_Path == "/")
return true;
// Iterate through all partitions
@@ -799,7 +799,6 @@
string Backup_Name, Backup_List, backup_path;
unsigned long long total_bytes = 0, free_space = 0;
TWPartition* storage = NULL;
- std::vector<TWPartition*>::iterator subpart;
struct tm *t;
time_t seconds, total_start, total_stop;
size_t start_pos = 0, end_pos = 0;
@@ -2960,7 +2959,7 @@
int len = recv(uevent_pfd.fd, buf, sizeof(buf), MSG_DONTWAIT);
if (len == -1) {
- LOGINFO("recv error on uevent\n");
+ LOGERR("recv error on uevent\n");
return;
}
/*int i = 0; // Print all uevent output for test /debug