Enable liblog on host bionic am: 0910d2dbb9 am: 32010171bd
am: fb1a1dbe6c
Change-Id: Idb398d60741a13e9027a8968c15c413cb1c16439
diff --git a/liblog/Android.bp b/liblog/Android.bp
index 16aa4fa..c498153 100644
--- a/liblog/Android.bp
+++ b/liblog/Android.bp
@@ -73,6 +73,9 @@
linux: {
host_ldlibs: ["-lrt"],
},
+ linux_bionic: {
+ enabled: true,
+ },
},
cflags: [
diff --git a/liblog/logger_write.c b/liblog/logger_write.c
index 170c8d1..f19c3ab 100644
--- a/liblog/logger_write.c
+++ b/liblog/logger_write.c
@@ -48,7 +48,7 @@
static int check_log_uid_permissions()
{
-#if defined(__BIONIC__)
+#if defined(__ANDROID__)
uid_t uid = __android_log_uid();
/* Matches clientHasLogCredentials() in logd */
@@ -130,7 +130,7 @@
return kLogNotAvailable;
}
-#if defined(__BIONIC__)
+#if defined(__ANDROID__)
static atomic_uintptr_t tagMap;
#endif
@@ -140,7 +140,7 @@
LIBLOG_ABI_PUBLIC void __android_log_close()
{
struct android_log_transport_write *transport;
-#if defined(__BIONIC__)
+#if defined(__ANDROID__)
EventTagMap *m;
#endif
@@ -170,7 +170,7 @@
}
}
-#if defined(__BIONIC__)
+#if defined(__ANDROID__)
/*
* Additional risk here somewhat mitigated by immediately unlock flushing
* the processor cache. The multi-threaded race that we choose to accept,
@@ -188,7 +188,7 @@
__android_log_unlock();
-#if defined(__BIONIC__)
+#if defined(__ANDROID__)
if (m != (EventTagMap *)(uintptr_t)-1LL) android_closeEventTagMap(m);
#endif
@@ -261,7 +261,7 @@
return -EINVAL;
}
-#if defined(__BIONIC__)
+#if defined(__ANDROID__)
if (log_id == LOG_ID_SECURITY) {
if (vec[0].iov_len < 4) {
return -EINVAL;