diff options
| author | Dan Albert <danalbert@google.com> | 2015-02-20 00:05:30 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-20 00:05:30 +0000 |
| commit | 552fceb85cde45581ef04a23a2e76e6298ed15a5 (patch) | |
| tree | 50a26b997958b2db8d64ade8618d72b30a148992 /recovery.cpp | |
| parent | c2b60b9870955c14ec8434353d617ebca6f44368 (diff) | |
| parent | 2d1022250941873f8748e6a159d4e5bf976e511f (diff) | |
| download | bootable_recovery-552fceb85cde45581ef04a23a2e76e6298ed15a5.zip bootable_recovery-552fceb85cde45581ef04a23a2e76e6298ed15a5.tar.gz bootable_recovery-552fceb85cde45581ef04a23a2e76e6298ed15a5.tar.bz2 | |
am 2d102225: Merge "Kill of most of the remainder of minadbd."
* commit '2d1022250941873f8748e6a159d4e5bf976e511f':
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 e42474e..0760613 100644 --- a/recovery.cpp +++ b/recovery.cpp @@ -44,7 +44,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" } @@ -998,7 +998,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; } |