aboutsummaryrefslogtreecommitdiffstats
path: root/adb/adb.h
diff options
context:
space:
mode:
authorStefan Hilzinger <hilzinger@google.com>2010-04-19 12:21:12 +0100
committerMike Lockwood <lockwood@android.com>2010-04-28 11:38:34 -0400
commita84a42eb20d43ffa2695a69d583a6e09532b49d9 (patch)
tree5e4bdb78537f31743102a302442e532eefbc4407 /adb/adb.h
parent23e64161be09ce26cb4d213a860f61e1fe77d975 (diff)
downloadsystem_core-a84a42eb20d43ffa2695a69d583a6e09532b49d9.tar.gz
system_core-a84a42eb20d43ffa2695a69d583a6e09532b49d9.tar.bz2
system_core-a84a42eb20d43ffa2695a69d583a6e09532b49d9.zip
Make adb's daemon-port on the host machine configurable.
This is the first CL of a somewhat larger effort which, among other things, will involve changing the emulator and ddms to talk to adb running on a configurable port. The port can be configured using environment variable ANDROID_ADB_SERVER_PORT. Further CLs will also address the set of ports used for the local transport. Change-Id: Ib2f431801f0adcd9f2dd290a28005644a36a780a
Diffstat (limited to 'adb/adb.h')
-rw-r--r--adb/adb.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/adb/adb.h b/adb/adb.h
index aaf8a285..a2b611e6 100644
--- a/adb/adb.h
+++ b/adb/adb.h
@@ -237,8 +237,8 @@ void handle_packet(apacket *p, atransport *t);
void send_packet(apacket *p, atransport *t);
void get_my_path(char *s, size_t maxLen);
-int launch_server();
-int adb_main(int is_daemon);
+int launch_server(int server_port);
+int adb_main(int is_daemon, int server_port);
/* transports are ref-counted
@@ -358,8 +358,8 @@ typedef enum {
#define print_packet(tag,p) do {} while (0)
#endif
-#define ADB_PORT 5037
-#define ADB_LOCAL_TRANSPORT_PORT 5555
+#define DEFAULT_ADB_PORT 5037
+#define DEFAULT_ADB_LOCAL_TRANSPORT_PORT 5555
#define ADB_CLASS 0xff
#define ADB_SUBCLASS 0x42