summaryrefslogtreecommitdiffstats
path: root/adb
diff options
context:
space:
mode:
authorVladimir Chtchetkine <vchtchetkine@google.com>2011-12-13 12:19:29 -0800
committerVladimir Chtchetkine <vchtchetkine@google.com>2011-12-13 12:19:29 -0800
commitc4f37eed734ecd3310bbe241df1b940329e91d74 (patch)
treea7355136f08e7c075659a3858234b15d9baa47fb /adb
parentea36579f77c2ae3553e6208cc49758c180c7e98b (diff)
downloadcore-c4f37eed734ecd3310bbe241df1b940329e91d74.tar.gz
core-c4f37eed734ecd3310bbe241df1b940329e91d74.tar.bz2
core-c4f37eed734ecd3310bbe241df1b940329e91d74.zip
Fix the build.
Conditionally compile code that is intended to run inside the emulator only. Change-Id: Ie82e415b2ff52395616f85871dddb38e65b0ed55
Diffstat (limited to 'adb')
-rw-r--r--adb/transport_local.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/adb/transport_local.c b/adb/transport_local.c
index 8bea70caa..d985ee3a6 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");