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/common.h b/common.h
old mode 100644
new mode 100755
index 6215b1d..e82bec3
--- a/common.h
+++ b/common.h
@@ -14,19 +14,11 @@
* limitations under the License.
*/
-<<<<<<< HEAD
-#ifndef RECOVERY_COMMON_H
-#define RECOVERY_COMMON_H
-
-#include <stdio.h>
-#include <stdarg.h>
-=======
#pragma once
->>>>>>> android-10.0.0_r25
#include <string>
-#ifdef __cplusplus
+#ifndef __cplusplus
extern "C" {
#endif
@@ -54,12 +46,7 @@
extern struct selabel_handle* sehandle;
extern RecoveryUI* ui;
-<<<<<<< HEAD
-extern bool modified_flash;
-//typedef struct fstab_rec Volume;
-=======
extern bool has_cache;
->>>>>>> android-10.0.0_r25
// The current stage, e.g. "1/2".
extern std::string stage;
@@ -67,21 +54,4 @@
// The reason argument provided in "--reason=".
extern const char* reason;
-<<<<<<< HEAD
-// fopen a file, mounting volumes and making parent dirs as necessary.
-FILE* fopen_path(const char *path, const char *mode);
-
-void ui_print(const char* format, ...);
-
-//static bool is_ro_debuggable();
-
-#ifdef __cplusplus
-}
-#endif
-
-bool reboot(const std::string& command);
-
-#endif // RECOVERY_COMMON_H
-=======
-bool is_ro_debuggable();
->>>>>>> android-10.0.0_r25
+// static bool is_ro_debuggable();