diff options
| author | Vladimir Chtchetkine <vchtchetkine@google.com> | 2011-12-13 12:53:18 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-12-13 12:53:18 -0800 |
| commit | d7f2dfdfeaad42f708d87d96e387ead492d0941d (patch) | |
| tree | 40def90842e51e2fe5adc2fd04030e96ba82ab88 | |
| parent | e565492c6c2807f5952bc51a309e98b204350616 (diff) | |
| parent | c4f37eed734ecd3310bbe241df1b940329e91d74 (diff) | |
| download | system_core-d7f2dfdfeaad42f708d87d96e387ead492d0941d.tar.gz system_core-d7f2dfdfeaad42f708d87d96e387ead492d0941d.tar.bz2 system_core-d7f2dfdfeaad42f708d87d96e387ead492d0941d.zip | |
Merge "Fix the build."
| -rw-r--r-- | adb/transport_local.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/adb/transport_local.c b/adb/transport_local.c index 8bea70ca..d985ee3a 100644 --- a/adb/transport_local.c +++ b/adb/transport_local.c @@ -185,6 +185,8 @@ static void *server_socket_thread(void * arg) return 0; } +/* This is relevant only for ADB daemon running inside the emulator. */ +#if !ADB_HOST /* * Redefine open and write for qemu_pipe.h that contains inlined references * to those routines. We will redifine them back after qemu_pipe.h inclusion. @@ -292,6 +294,7 @@ static const char _ok_resp[] = "ok"; D("transport: qemu_socket_thread() exiting\n"); return 0; } +#endif // !ADB_HOST void local_init(int port) { @@ -301,6 +304,9 @@ void local_init(int port) if(HOST) { func = client_socket_thread; } else { +#if ADB_HOST + func = server_socket_thread; +#else /* For the adbd daemon in the system image we need to distinguish * between the device, and the emulator. */ char is_qemu[PROPERTY_VALUE_MAX]; @@ -312,6 +318,7 @@ void local_init(int port) /* Running inside the device: use TCP socket as the transport. */ func = server_socket_thread; } +#endif !ADB_HOST } D("transport: local %s init\n", HOST ? "client" : "server"); |