diff options
author | Tianjie Xu <xunchang@google.com> | 2019-04-12 01:42:25 +0200 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-04-12 01:42:25 +0200 |
commit | 6c5f70b9b2ed9233b6b7db11c96c331e5927bf4e (patch) | |
tree | fc51bb568fdb244bd4cc7687a665230a1f3a9fa4 /recovery_main.cpp | |
parent | Merge "Build libinstall as a static library." (diff) | |
parent | Add socket communication between recovery and minadbd (diff) | |
download | android_bootable_recovery-6c5f70b9b2ed9233b6b7db11c96c331e5927bf4e.tar android_bootable_recovery-6c5f70b9b2ed9233b6b7db11c96c331e5927bf4e.tar.gz android_bootable_recovery-6c5f70b9b2ed9233b6b7db11c96c331e5927bf4e.tar.bz2 android_bootable_recovery-6c5f70b9b2ed9233b6b7db11c96c331e5927bf4e.tar.lz android_bootable_recovery-6c5f70b9b2ed9233b6b7db11c96c331e5927bf4e.tar.xz android_bootable_recovery-6c5f70b9b2ed9233b6b7db11c96c331e5927bf4e.tar.zst android_bootable_recovery-6c5f70b9b2ed9233b6b7db11c96c331e5927bf4e.zip |
Diffstat (limited to '')
-rw-r--r-- | recovery_main.cpp | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/recovery_main.cpp b/recovery_main.cpp index b41368d7b..8b4ad5a32 100644 --- a/recovery_main.cpp +++ b/recovery_main.cpp @@ -51,7 +51,6 @@ #include "common.h" #include "fastboot/fastboot.h" #include "logging.h" -#include "minadbd/minadbd.h" #include "otautil/paths.h" #include "otautil/roots.h" #include "otautil/sysutil.h" @@ -322,16 +321,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 |