summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-devtools/android-tools/android-tools/use-local-socket.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta-oe/recipes-devtools/android-tools/android-tools/use-local-socket.patch')
-rw-r--r--meta-oe/recipes-devtools/android-tools/android-tools/use-local-socket.patch18
1 files changed, 9 insertions, 9 deletions
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/use-local-socket.patch b/meta-oe/recipes-devtools/android-tools/android-tools/use-local-socket.patch
index 7facd61b9..0ff37e038 100644
--- a/meta-oe/recipes-devtools/android-tools/android-tools/use-local-socket.patch
+++ b/meta-oe/recipes-devtools/android-tools/android-tools/use-local-socket.patch
@@ -3,13 +3,13 @@ Author: Hilko Bengen <bengen@debian.org>
3 3
4Upstream-Status: Inappropriate 4Upstream-Status: Inappropriate
5--- 5---
6 system/core/adb/adb.c | 6 +++++- 6 adb/adb.c | 6 +++++-
7 system/core/adb/adb_client.c | 5 +++-- 7 adb/adb_client.c | 5 +++--
8 system/core/adb/transport_local.c | 3 ++- 8 adb/transport_local.c | 3 ++-
9 3 files changed, 10 insertions(+), 4 deletions(-) 9 3 files changed, 10 insertions(+), 4 deletions(-)
10 10
11--- a/system/core/adb/adb.c 11--- a/adb/adb.c
12+++ b/system/core/adb/adb.c 12+++ b/adb/adb.c
13@@ -1230,7 +1230,11 @@ int launch_server(int server_port) 13@@ -1230,7 +1230,11 @@ int launch_server(int server_port)
14 */ 14 */
15 void build_local_name(char* target_str, size_t target_size, int server_port) 15 void build_local_name(char* target_str, size_t target_size, int server_port)
@@ -23,8 +23,8 @@ Upstream-Status: Inappropriate
23 } 23 }
24 24
25 #if !ADB_HOST 25 #if !ADB_HOST
26--- a/system/core/adb/adb_client.c 26--- a/adb/adb_client.c
27+++ b/system/core/adb/adb_client.c 27+++ b/adb/adb_client.c
28@@ -185,12 +185,12 @@ int _adb_connect(const char *service) 28@@ -185,12 +185,12 @@ int _adb_connect(const char *service)
29 strcpy(__adb_error, "service name too long"); 29 strcpy(__adb_error, "service name too long");
30 return -1; 30 return -1;
@@ -48,8 +48,8 @@ Upstream-Status: Inappropriate
48 if(writex(fd, tmp, 4) || writex(fd, service, len)) { 48 if(writex(fd, tmp, 4) || writex(fd, service, len)) {
49 strcpy(__adb_error, "write failure during connection"); 49 strcpy(__adb_error, "write failure during connection");
50 adb_close(fd); 50 adb_close(fd);
51--- a/system/core/adb/transport_local.c 51--- a/adb/transport_local.c
52+++ b/system/core/adb/transport_local.c 52+++ b/adb/transport_local.c
53@@ -121,7 +121,8 @@ int local_connect_arbitrary_ports(int co 53@@ -121,7 +121,8 @@ int local_connect_arbitrary_ports(int co
54 } 54 }
55 #endif 55 #endif