Cherry-picked from c4f37eed7 in master. Do not merge.
Fix the build.
Conditionally compile code that is intended to run inside the emulator only.
Change-Id: Ie82e415b2ff52395616f85871dddb38e65b0ed55
diff --git a/adb/transport_local.c b/adb/transport_local.c
index 8bea70c..d985ee3 100644
--- a/adb/transport_local.c
+++ b/adb/transport_local.c
@@ -185,6 +185,8 @@
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 @@
D("transport: qemu_socket_thread() exiting\n");
return 0;
}
+#endif // !ADB_HOST
void local_init(int port)
{
@@ -301,6 +304,9 @@
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 @@
/* 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");