summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorMark Salyzyn <salyzyn@google.com>2016-10-17 14:28:00 -0700
committerMark Salyzyn <salyzyn@google.com>2016-10-20 08:11:39 -0700
commitcfd5b080af8de527d768f0ff7902c26af8d49307 (patch)
tree32295b3aeb6ba8a116592576939348d09814b0be /include
parent1edd61ce5d2f34ff34d015643b5915b3b1c186e8 (diff)
downloadsystem_core-cfd5b080af8de527d768f0ff7902c26af8d49307.tar.gz
system_core-cfd5b080af8de527d768f0ff7902c26af8d49307.tar.bz2
system_core-cfd5b080af8de527d768f0ff7902c26af8d49307.zip
system/core: preparation to pull back interfaces from android/log.h
Point to log/log.h where necessary, define LOG_TAG where necessary. Accept that private/android_logger.h is suitable replacement for log/logger.h and android/log.h. Correct liblog/README Effectively a cleanup and controlled select revert of 'system/core: drop or replace log/logger.h' and 'system/core: Replace log/log.h with android/log.h'. Test: compile Bug: 30465923 Change-Id: Ic2ad157bad6f5efe2c6af293a73bb753300b17a2
Diffstat (limited to 'include')
-rw-r--r--include/log/logger.h2
-rw-r--r--include/utils/Log.h2
-rw-r--r--include/utils/SortedVector.h2
-rw-r--r--include/utils/Vector.h2
4 files changed, 4 insertions, 4 deletions
diff --git a/include/log/logger.h b/include/log/logger.h
index 46587fb74..65b38de8d 100644
--- a/include/log/logger.h
+++ b/include/log/logger.h
@@ -17,7 +17,7 @@
#include <string>
#endif
-#include <android/log.h>
+#include <log/log.h>
#ifdef __cplusplus
extern "C" {
diff --git a/include/utils/Log.h b/include/utils/Log.h
index 6ef3fa37d..5276a498d 100644
--- a/include/utils/Log.h
+++ b/include/utils/Log.h
@@ -30,7 +30,7 @@
#include <sys/types.h>
-#include <android/log.h>
+#include <log/log.h>
#ifdef __cplusplus
diff --git a/include/utils/SortedVector.h b/include/utils/SortedVector.h
index 9f2ec021f..86f349645 100644
--- a/include/utils/SortedVector.h
+++ b/include/utils/SortedVector.h
@@ -21,7 +21,7 @@
#include <stdint.h>
#include <sys/types.h>
-#include <android/log.h>
+#include <log/log.h>
#include <utils/TypeHelpers.h>
#include <utils/Vector.h>
#include <utils/VectorImpl.h>
diff --git a/include/utils/Vector.h b/include/utils/Vector.h
index 6c1931ed7..28a77b834 100644
--- a/include/utils/Vector.h
+++ b/include/utils/Vector.h
@@ -22,7 +22,7 @@
#include <new>
-#include <android/log.h>
+#include <log/log.h>
#include <utils/TypeHelpers.h>
#include <utils/VectorImpl.h>