diff options
author | Dan Albert <danalbert@google.com> | 2015-02-19 23:47:21 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-02-19 23:47:22 +0000 |
commit | 2d1022250941873f8748e6a159d4e5bf976e511f (patch) | |
tree | 247e812a898020502652e1cae9f244acab0aa517 /recovery.cpp | |
parent | 4eb6c71e7f013e684828ae6216f61b83be552282 (diff) | |
parent | f3a5726919ce35d3f5e628e9561496470195ac1f (diff) | |
download | bootable_recovery-2d1022250941873f8748e6a159d4e5bf976e511f.tar.gz bootable_recovery-2d1022250941873f8748e6a159d4e5bf976e511f.tar.bz2 bootable_recovery-2d1022250941873f8748e6a159d4e5bf976e511f.zip |
Merge "Kill of most of the remainder of minadbd."
Diffstat (limited to 'recovery.cpp')
-rw-r--r-- | recovery.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/recovery.cpp b/recovery.cpp index d8756d7..2b5332e 100644 --- a/recovery.cpp +++ b/recovery.cpp @@ -43,7 +43,7 @@ #include "device.h" #include "adb_install.h" extern "C" { -#include "minadbd/adb.h" +#include "adb.h" #include "fuse_sideload.h" #include "fuse_sdcard_provider.h" } @@ -841,7 +841,7 @@ main(int argc, char **argv) { // 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) { - adb_main(); + adb_main(0, DEFAULT_ADB_PORT); return 0; } |