diff options
Diffstat (limited to 'recovery_main.cpp')
| -rw-r--r-- | recovery_main.cpp | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/recovery_main.cpp b/recovery_main.cpp index b41368d7b..5f3ab76dd 100644 --- a/recovery_main.cpp +++ b/recovery_main.cpp @@ -50,8 +50,8 @@ #include "common.h" #include "fastboot/fastboot.h" -#include "logging.h" -#include "minadbd/minadbd.h" +#include "install/wipe_data.h" +#include "otautil/logging.h" #include "otautil/paths.h" #include "otautil/roots.h" #include "otautil/sysutil.h" @@ -322,16 +322,6 @@ int main(int argc, char** argv) { // Take action to refresh pmsg contents __android_log_pmsg_file_read(LOG_ID_SYSTEM, ANDROID_LOG_INFO, filter, logrotate, &do_rotate); - // If this binary is started with the single argument "--adbd", instead of being the normal - // recovery binary, it turns into kind of a stripped-down version of adbd that only supports the - // 'sideload' command. Note this must be a real argument, not anything in the command file or - // bootloader control block; the only way recovery should be run with this argument is when it - // starts a copy of itself from the apply_from_adb() function. - if (argc == 2 && strcmp(argv[1], "--adbd") == 0) { - minadbd_main(); - return 0; - } - time_t start = time(nullptr); // redirect_stdio should be called only in non-sideload mode. Otherwise we may have two logger @@ -445,6 +435,8 @@ int main(int argc, char** argv) { ui->Print("Warning: No file_contexts\n"); } + SetLoggingSehandle(sehandle); + std::atomic<Device::BuiltinAction> action; std::thread listener_thread(ListenRecoverySocket, ui, std::ref(action)); listener_thread.detach(); |