diff options
Diffstat (limited to 'meta-oe/recipes-devtools/android-tools/android-tools/core/0011-Remove-bionic-specific-calls.patch')
-rw-r--r-- | meta-oe/recipes-devtools/android-tools/android-tools/core/0011-Remove-bionic-specific-calls.patch | 64 |
1 files changed, 0 insertions, 64 deletions
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/core/0011-Remove-bionic-specific-calls.patch b/meta-oe/recipes-devtools/android-tools/android-tools/core/0011-Remove-bionic-specific-calls.patch deleted file mode 100644 index 5b18f461a3..0000000000 --- a/meta-oe/recipes-devtools/android-tools/android-tools/core/0011-Remove-bionic-specific-calls.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 9eff8799831961c0edf6e37e5d4cbf43baa7c748 Mon Sep 17 00:00:00 2001 -From: Fathi Boudra <fabo@debian.org> -Date: Wed, 7 Sep 2016 12:58:47 +0300 -Subject: [PATCH] Remove bionic specific calls - -Upstream-Status: Inappropriate ---- - include/cutils/properties.h | 1 - - libcutils/properties.c | 2 +- - liblog/logd_write.c | 5 +++++ - 3 files changed, 6 insertions(+), 2 deletions(-) - -diff --git a/include/cutils/properties.h b/include/cutils/properties.h -index 798db8b36f..7d01f28d6e 100644 ---- a/include/cutils/properties.h -+++ b/include/cutils/properties.h -@@ -19,7 +19,6 @@ - - #include <sys/cdefs.h> - #include <stddef.h> --#include <sys/system_properties.h> - #include <stdint.h> - - #ifdef __cplusplus -diff --git a/libcutils/properties.c b/libcutils/properties.c -index b283658aa4..4151e7882c 100644 ---- a/libcutils/properties.c -+++ b/libcutils/properties.c -@@ -104,10 +104,10 @@ int32_t property_get_int32(const char *key, int32_t default_value) { - return (int32_t)property_get_imax(key, INT32_MIN, INT32_MAX, default_value); - } - -+#undef HAVE_LIBC_SYSTEM_PROPERTIES - #ifdef HAVE_LIBC_SYSTEM_PROPERTIES - - #define _REALLY_INCLUDE_SYS__SYSTEM_PROPERTIES_H_ --#include <sys/_system_properties.h> - - int property_set(const char *key, const char *value) - { -diff --git a/liblog/logd_write.c b/liblog/logd_write.c -index b2668cedb7..f5a44fe901 100644 ---- a/liblog/logd_write.c -+++ b/liblog/logd_write.c -@@ -23,6 +23,7 @@ - #include <stdlib.h> - #include <string.h> - #include <sys/stat.h> -+#include <sys/syscall.h> - #include <sys/types.h> - #if (FAKE_LOG_DEVICE == 0) - #include <sys/socket.h> -@@ -205,7 +206,11 @@ static int __write_to_log_kernel(log_id_t log_id, struct iovec *vec, size_t nr) - realtime_ts.tv_nsec = ts.tv_nsec; - - log_id_buf = log_id; -+#ifdef __BIONIC__ - tid = gettid(); -+#else -+ tid = (pid_t) syscall(__NR_gettid); -+#endif - - newVec[0].iov_base = (unsigned char *) &log_id_buf; - newVec[0].iov_len = sizeof_log_id_t; |