commit 34ae483e025c5b5c3293d6b6e78a623d40987fe8
author Ethan Yonker <dees_troy@teamw.in> Wed Aug 24 15:32:18 2016 -0500
committer Ethan Yonker <dees_troy@teamw.in> Wed Aug 24 15:32:18 2016 -0500
tree 9995af67d6f045375ff6d2ca147bbaf1adea4ebc
parent c45b2d59b38222f30bf789b4f21e0508031d15a9
parent 461ed46ccf68c0f52992667c26a1410c1762f94b

Update to 7.0

Change-Id: I621cc47352f7ac552d9602485825ae3a6f9ae516

twrp.cpp

diff --git a/twrp.cpp b/twrp.cpp
index 5d64694..e7076d9 100644
--- a/twrp.cpp
+++ b/twrp.cpp
@@ -24,9 +24,7 @@
 #include "gui/twmsg.h"
 
 #include "cutils/properties.h"
-extern "C" {
 #include "bootloader.h"
-}
 
 #ifdef ANDROID_RB_RESTART
 #include "cutils/android_reboot.h"
@@ -89,7 +87,7 @@
 	if (argc == 3 && strcmp(argv[1], "--adbd") == 0) {
 		property_set("ctl.stop", "adbd");
 #ifdef TW_USE_NEW_MINADBD
-		adb_main(0, DEFAULT_ADB_PORT);
+		adb_server_main(0, DEFAULT_ADB_PORT, -1);
 #else
 		adb_main(argv[2]);
 #endif