1 files changed, 45 insertions, 23 deletions
diff --git a/development/android-tools/fix_build.patch b/development/android-tools/fix_build.patch
index 5747f1dddd..9f96915ecd 100644
--- a/development/android-tools/fix_build.patch
+++ b/development/android-tools/fix_build.patch
@@ -1,5 +1,37 @@
---- a/core/base/file.cpp
-+++ b/core/base/file.cpp
+diff -ru core.org/adb/sysdeps.h core/adb/sysdeps.h
+--- core.org/adb/sysdeps.h	2016-11-07 10:10:52.000000000 +0100
++++ core/adb/sysdeps.h	2016-11-07 16:57:55.952716945 +0100
+@@ -25,6 +25,7 @@
+ #endif
+ 
+ #include <errno.h>
++#include <sys/syscall.h>
+ 
+ #include <string>
+ #include <vector>
+@@ -810,7 +811,7 @@
+ 
+ static __inline__ unsigned long adb_thread_id()
+ {
+-    return (unsigned long)gettid();
++    return syscall(__NR_gettid);
+ }
+ 
+ #endif /* !_WIN32 */
+diff -ru core.org/base/errors_unix.cpp core/base/errors_unix.cpp
+--- core.org/base/errors_unix.cpp	2016-11-07 10:10:52.000000000 +0100
++++ core/base/errors_unix.cpp	2016-11-07 10:44:15.217399254 +0100
+@@ -17,6 +17,7 @@
+ #include "android-base/errors.h"
+ 
+ #include <errno.h>
++#include <string.h>
+ 
+ namespace android {
+ namespace base {
+diff -ru core.org/base/file.cpp core/base/file.cpp
+--- core.org/base/file.cpp	2016-11-07 10:10:52.000000000 +0100
++++ core/base/file.cpp	2016-11-07 10:44:35.901793592 +0100
 @@ -20,6 +20,7 @@
  #include <fcntl.h>
  #include <sys/stat.h>
@@ -8,24 +40,14 @@
  
  #include <string>
  
---- a/core/liblog/log_read.c
-+++ b/core/liblog/log_read.c
-@@ -26,6 +26,7 @@
- #include <string.h>
- #include <sys/cdefs.h>
- #include <unistd.h>
-+#include <sys/user.h>
- 
- #include <cutils/list.h>
- #include <cutils/sockets.h>
-
---- a/libselinux/src/label_internal.h
-+++ b/libselinux/src/label_internal.h
-@@ -10,6 +10,7 @@
- 
- #include <stdlib.h>
- #include <stdarg.h>
-+#include <stdbool.h>
- #include <selinux/selinux.h>
- #include <selinux/label.h>
- #include "dso.h"
+diff -ru core.org/base/logging.cpp core/base/logging.cpp
+--- core.org/base/logging.cpp	2016-11-07 10:10:52.000000000 +0100
++++ core/base/logging.cpp	2016-11-07 10:45:12.527487064 +0100
+@@ -21,6 +21,7 @@
+ #include "android-base/logging.h"
+ 
+ #include <libgen.h>
++#include <string.h>
+ 
+ // For getprogname(3) or program_invocation_short_name.
+ #if defined(__ANDROID__) || defined(__APPLE__)