tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

am ae429828: Cherry-picked from c4f37eed7 in master. Do not merge.

Browse source 
* commit 'ae4298286896cbef22b2af285a3f651e8f498185':
  Cherry-picked from c4f37eed7 in master. Do not merge.
This commit is contained in:
Vladimir Chtchetkine 2012-01-10 16:28:42 -08:00 committed by Android Git Automerger
commit 88ffed14ce
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
adb/transport_local.c
View file

@ -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");