summaryrefslogtreecommitdiffstats
path: root/recovery.cpp
diff options
context:
space:
mode:
authorDan Albert <danalbert@google.com>2015-02-20 01:23:43 +0100
committerAndroid Git Automerger <android-git-automerger@android.com>2015-02-20 01:23:43 +0100
commitdda456b5da3d59a71b486aa85912dec65b3089b2 (patch)
tree50a26b997958b2db8d64ade8618d72b30a148992 /recovery.cpp
parentam c2b60b98: Merge commit \'f8dd04e1a5f94e7accf65a5375114ac7fa73f828\' into HEAD (diff)
parentam 2d102225: Merge "Kill of most of the remainder of minadbd." (diff)
downloadandroid_bootable_recovery-dda456b5da3d59a71b486aa85912dec65b3089b2.tar
android_bootable_recovery-dda456b5da3d59a71b486aa85912dec65b3089b2.tar.gz
android_bootable_recovery-dda456b5da3d59a71b486aa85912dec65b3089b2.tar.bz2
android_bootable_recovery-dda456b5da3d59a71b486aa85912dec65b3089b2.tar.lz
android_bootable_recovery-dda456b5da3d59a71b486aa85912dec65b3089b2.tar.xz
android_bootable_recovery-dda456b5da3d59a71b486aa85912dec65b3089b2.tar.zst
android_bootable_recovery-dda456b5da3d59a71b486aa85912dec65b3089b2.zip
Diffstat (limited to 'recovery.cpp')
-rw-r--r--recovery.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/recovery.cpp b/recovery.cpp
index e42474e73..07606137b 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;
}