summaryrefslogtreecommitdiffstats
path: root/libc/bionic
diff options
context:
space:
mode:
authorDavid 'Digit' Turner <digit@google.com>2010-06-10 23:34:24 -0700
committerDavid 'Digit' Turner <digit@google.com>2010-06-11 13:49:09 -0700
commit6c8a2f2a5bc8d612ee953f528f2b5eb35983656a (patch)
tree7dd45d3e3162220578e93a6cb7244b4209b1c7c5 /libc/bionic
parent038fbae518e904c7aba64779714a22dbeeb90887 (diff)
downloadbionic-6c8a2f2a5bc8d612ee953f528f2b5eb35983656a.tar.gz
bionic-6c8a2f2a5bc8d612ee953f528f2b5eb35983656a.tar.bz2
bionic-6c8a2f2a5bc8d612ee953f528f2b5eb35983656a.zip
libc: remove cutils dependencies
We simply copy the stuff we need from cutils headers. A future patch will change cutils to include the private <bionic_atomic_inline.h> Change-Id: Ib6fd9a03bc9e337ce867bd606dc94c2b4438480a
Diffstat (limited to 'libc/bionic')
-rw-r--r--libc/bionic/logd_write.c9
-rw-r--r--libc/bionic/pthread.c2
-rw-r--r--libc/bionic/semaphore.c2
3 files changed, 9 insertions, 4 deletions
diff --git a/libc/bionic/logd_write.c b/libc/bionic/logd_write.c
index 618160faa..63dfd596b 100644
--- a/libc/bionic/logd_write.c
+++ b/libc/bionic/logd_write.c
@@ -38,12 +38,17 @@
#include <stdarg.h>
#include <fcntl.h>
-#include <cutils/logger.h>
#include "logd.h"
+/* should match system/core/include/cutils/logger.h */
+#define LOGGER_LOG_MAIN "log/main"
+#define LOGGER_LOG_RADIO "log/radio"
+#define LOGGER_LOG_EVENTS "log/events"
+#define LOGGER_LOG_SYSTEM "log/system"
+
#include <pthread.h>
-#define LOG_BUF_SIZE 1024
+#define LOG_BUF_SIZE 1024
typedef enum {
LOG_ID_NONE = 0,
diff --git a/libc/bionic/pthread.c b/libc/bionic/pthread.c
index ac5e6bf31..8eee136b3 100644
--- a/libc/bionic/pthread.c
+++ b/libc/bionic/pthread.c
@@ -44,7 +44,7 @@
#include <assert.h>
#include <malloc.h>
#include <bionic_futex.h>
-#include <cutils/atomic-inline.h>
+#include <bionic_atomic_inline.h>
#include <sys/prctl.h>
#include <sys/stat.h>
#include <fcntl.h>
diff --git a/libc/bionic/semaphore.c b/libc/bionic/semaphore.c
index 39d049aea..0a6cab42a 100644
--- a/libc/bionic/semaphore.c
+++ b/libc/bionic/semaphore.c
@@ -30,7 +30,7 @@
#include <sys/time.h>
#include <sys/atomics.h>
#include <time.h>
-#include <cutils/atomic-inline.h>
+#include <bionic_atomic_inline.h>
#include <bionic_futex.h>
/* Use the lower 31-bits for the counter, and the high bit for