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/gui/action.cpp b/gui/action.cpp
index 0216d84..52d924b 100755
--- a/gui/action.cpp
+++ b/gui/action.cpp
@@ -40,8 +40,9 @@
#include "../twrp-functions.hpp"
#include "../openrecoveryscript.hpp"
-#include "../adb_install.h"
-#include "../fuse_sideload.h"
+#include "install/adb_install.h"
+
+#include "fuse_sideload.h"
#include "blanktimer.hpp"
#include "../twinstall.h"
@@ -49,14 +50,14 @@
#include "../twcommon.h"
#include "../variables.h"
#include "cutils/properties.h"
-#include "../adb_install.h"
+#include "install/adb_install.h"
};
-#include "../set_metadata.h"
+#include "set_metadata.h"
#include "../minuitwrp/minui.h"
#include "rapidxml.hpp"
#include "objects.hpp"
-#include "../tw_atomic.hpp"
+#include "tw_atomic.hpp"
GUIAction::mapFunc GUIAction::mf;
std::set<string> GUIAction::setActionsRunningInCallerThread;
@@ -1533,7 +1534,9 @@
bool mtp_was_enabled = TWFunc::Toggle_MTP(false);
// wait for the adb connection
- int ret = apply_from_adb("/", &sideload_child_pid);
+ // int ret = apply_from_adb("/", &sideload_child_pid);
+ Device::BuiltinAction reboot_action = Device::REBOOT_BOOTLOADER;
+ int ret = ApplyFromAdb("/", &reboot_action);
DataManager::SetValue("tw_has_cancel", 0); // Remove cancel button from gui now that the zip install is going to start
if (ret != 0) {