liblog: Replace log/log.h with android/log.h
Move all liblog related content into android/log.h, and make
log/log.h points to android/log.h.
Test: Compile
Bug: 26552300
Bug: 31289077
Change-Id: I858e0ebe047b86f2a8530a99bc9c380d3d58edbb
diff --git a/liblog/README b/liblog/README
index df1e68c..eefa80f 100644
--- a/liblog/README
+++ b/liblog/README
@@ -6,7 +6,7 @@
liblog - Android NDK logger interfaces
SYNOPSIS
- #include <log/log.h>
+ #include <android/log.h>
ALOG(android_priority, tag, format, ...)
IF_ALOG(android_priority, tag)
diff --git a/liblog/event_tag_map.c b/liblog/event_tag_map.c
index c8943e0..c2dc74c 100644
--- a/liblog/event_tag_map.c
+++ b/liblog/event_tag_map.c
@@ -23,8 +23,8 @@
#include <string.h>
#include <sys/mman.h>
+#include <android/log.h>
#include <log/event_tag_map.h>
-#include <log/log.h>
#include "log_portability.h"
diff --git a/liblog/fake_log_device.c b/liblog/fake_log_device.c
index 8e5df3d..1b57e75 100644
--- a/liblog/fake_log_device.c
+++ b/liblog/fake_log_device.c
@@ -28,7 +28,7 @@
#include <stdlib.h>
#include <string.h>
-#include <log/log.h>
+#include <android/log.h>
#include "fake_log_device.h"
#include "log_portability.h"
diff --git a/liblog/fake_writer.c b/liblog/fake_writer.c
index dab8bc5..47935e3 100644
--- a/liblog/fake_writer.c
+++ b/liblog/fake_writer.c
@@ -18,7 +18,7 @@
#include <fcntl.h>
#include <unistd.h>
-#include <log/log.h>
+#include <android/log.h>
#include "config_write.h"
#include "fake_log_device.h"
diff --git a/liblog/log_event_list.c b/liblog/log_event_list.c
index 64d9024..a4244cd 100644
--- a/liblog/log_event_list.c
+++ b/liblog/log_event_list.c
@@ -22,7 +22,7 @@
#include <stdlib.h>
#include <string.h>
-#include <log/log.h>
+#include <android/log.h>
#include <log/logger.h>
#include "log_portability.h"
diff --git a/liblog/log_event_write.c b/liblog/log_event_write.c
index b9827a1..8c8a9a1 100644
--- a/liblog/log_event_write.c
+++ b/liblog/log_event_write.c
@@ -16,7 +16,7 @@
#include <errno.h>
-#include <log/log.h>
+#include <android/log.h>
#include "log_portability.h"
diff --git a/liblog/logd_reader.c b/liblog/logd_reader.c
index d796ecd..563b5c7 100644
--- a/liblog/logd_reader.c
+++ b/liblog/logd_reader.c
@@ -31,8 +31,8 @@
#include <time.h>
#include <unistd.h>
+#include <android/log.h>
#include <cutils/sockets.h>
-#include <log/log.h>
#include <log/logger.h>
#include <private/android_filesystem_config.h>
#include <private/android_logger.h>
diff --git a/liblog/logd_writer.c b/liblog/logd_writer.c
index 40ad48d..ebf8b3e 100644
--- a/liblog/logd_writer.c
+++ b/liblog/logd_writer.c
@@ -31,8 +31,8 @@
#include <time.h>
#include <unistd.h>
+#include <android/log.h>
#include <cutils/sockets.h>
-#include <log/log.h>
#include <log/logger.h>
#include <private/android_filesystem_config.h>
#include <private/android_logger.h>
diff --git a/liblog/logger.h b/liblog/logger.h
index 8367f44..8fb2b4d 100644
--- a/liblog/logger.h
+++ b/liblog/logger.h
@@ -20,8 +20,8 @@
#include <stdbool.h>
#include <log/uio.h>
+#include <android/log.h>
#include <cutils/list.h>
-#include <log/log.h>
#include <log/logger.h>
#include "log_portability.h"
diff --git a/liblog/logger_name.c b/liblog/logger_name.c
index b7ccac5..12e263a 100644
--- a/liblog/logger_name.c
+++ b/liblog/logger_name.c
@@ -16,7 +16,7 @@
#include <string.h>
-#include <log/log.h>
+#include <android/log.h>
#include <log/logger.h>
#include "log_portability.h"
diff --git a/liblog/logger_read.c b/liblog/logger_read.c
index 0d55453..d979e22 100644
--- a/liblog/logger_read.c
+++ b/liblog/logger_read.c
@@ -23,8 +23,8 @@
#include <string.h>
#include <unistd.h>
+#include <android/log.h>
#include <cutils/list.h>
-#include <log/log.h>
#include <log/logger.h>
#include <private/android_filesystem_config.h>
diff --git a/liblog/logger_write.c b/liblog/logger_write.c
index 583b799..4999aef 100644
--- a/liblog/logger_write.c
+++ b/liblog/logger_write.c
@@ -24,8 +24,8 @@
#include <android/set_abort_message.h>
#endif
+#include <android/log.h>
#include <log/event_tag_map.h>
-#include <log/log.h>
#include <log/logger.h>
#include <private/android_filesystem_config.h>
#include <private/android_logger.h>
diff --git a/liblog/logprint.c b/liblog/logprint.c
index 668b2ff..d857090 100644
--- a/liblog/logprint.c
+++ b/liblog/logprint.c
@@ -31,8 +31,8 @@
#include <sys/param.h>
#include <sys/types.h>
+#include <android/log.h>
#include <cutils/list.h>
-#include <log/log.h>
#include <log/logprint.h>
#include "log_portability.h"
diff --git a/liblog/pmsg_writer.c b/liblog/pmsg_writer.c
index 944feba..06652f3 100644
--- a/liblog/pmsg_writer.c
+++ b/liblog/pmsg_writer.c
@@ -25,7 +25,7 @@
#include <sys/types.h>
#include <time.h>
-#include <log/log.h>
+#include <android/log.h>
#include <log/logger.h>
#include <private/android_filesystem_config.h>
diff --git a/liblog/tests/liblog_benchmark.cpp b/liblog/tests/liblog_benchmark.cpp
index 22404d1..7561d8f 100644
--- a/liblog/tests/liblog_benchmark.cpp
+++ b/liblog/tests/liblog_benchmark.cpp
@@ -20,8 +20,8 @@
#include <sys/types.h>
#include <unistd.h>
+#include <android/log.h>
#include <cutils/sockets.h>
-#include <log/log.h>
#include <log/logger.h>
#include <private/android_logger.h>
diff --git a/liblog/tests/liblog_test.cpp b/liblog/tests/liblog_test.cpp
index cb9a522..6e709a9 100644
--- a/liblog/tests/liblog_test.cpp
+++ b/liblog/tests/liblog_test.cpp
@@ -22,9 +22,9 @@
#include <sys/types.h>
#include <unistd.h>
+#include <android/log.h>
#include <cutils/properties.h>
#include <gtest/gtest.h>
-#include <log/log.h>
#include <log/logger.h>
#include <log/logprint.h>
#include <private/android_filesystem_config.h>