diff options
Diffstat (limited to 'twrp.cpp')
| -rw-r--r-- | twrp.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
@@ -24,7 +24,7 @@ #include "gui/twmsg.h" #include "cutils/properties.h" -#include "bootloader_message/bootloader_message.h" +#include "bootloader_message_twrp/include/bootloader_message_twrp/bootloader_message.h" #ifdef ANDROID_RB_RESTART #include "cutils/android_reboot.h" @@ -46,7 +46,7 @@ extern "C" { #include "openrecoveryscript.hpp" #include "variables.h" #ifdef TW_USE_NEW_MINADBD -#include "adb.h" +#include "minadbd/minadbd.h" #else extern "C" { #include "minadbd21/adb.h" @@ -56,7 +56,7 @@ extern "C" { #include <selinux/label.h> struct selabel_handle *selinux_handle; -extern int adb_server_main(int is_daemon, int server_port, int /* reply_fd */); +//extern int adb_server_main(int is_daemon, int server_port, int /* reply_fd */); TWPartitionManager PartitionManager; int Log_Offset; @@ -85,7 +85,8 @@ int main(int argc, char **argv) { if (argc == 3 && strcmp(argv[1], "--adbd") == 0) { property_set("ctl.stop", "adbd"); #ifdef TW_USE_NEW_MINADBD - adb_server_main(0, DEFAULT_ADB_PORT, -1); + //adb_server_main(0, DEFAULT_ADB_PORT, -1); TODO fix this for android8 + minadbd_main(); #else adb_main(argv[2]); #endif @@ -176,7 +177,7 @@ int main(int argc, char **argv) { TWPartition* misc = PartitionManager.Find_Partition_By_Path("/misc"); if (misc != NULL) { if (misc->Current_File_System == "emmc") { - set_misc_device(misc->Actual_Block_Device); + set_misc_device(misc->Actual_Block_Device.c_str()); } else { LOGERR("Only emmc /misc is supported\n"); } |