diff options
| author | Mark Salyzyn <salyzyn@google.com> | 2016-10-17 14:28:00 -0700 |
|---|---|---|
| committer | Mark Salyzyn <salyzyn@google.com> | 2016-10-20 08:11:39 -0700 |
| commit | cfd5b080af8de527d768f0ff7902c26af8d49307 (patch) | |
| tree | 32295b3aeb6ba8a116592576939348d09814b0be /libcutils | |
| parent | 1edd61ce5d2f34ff34d015643b5915b3b1c186e8 (diff) | |
| download | system_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 'libcutils')
| -rw-r--r-- | libcutils/dlmalloc_stubs.c | 2 | ||||
| -rw-r--r-- | libcutils/fs.c | 1 | ||||
| -rw-r--r-- | libcutils/sched_policy.c | 2 | ||||
| -rw-r--r-- | libcutils/sockets_unix.cpp | 4 |
4 files changed, 8 insertions, 1 deletions
diff --git a/libcutils/dlmalloc_stubs.c b/libcutils/dlmalloc_stubs.c index 86fc88066..6c07bed9a 100644 --- a/libcutils/dlmalloc_stubs.c +++ b/libcutils/dlmalloc_stubs.c @@ -14,6 +14,8 @@ * limitations under the License. */ +#define LOG_TAG "dlmalloc-stubs" + #include "android/log.h" #define UNUSED __attribute__((__unused__)) diff --git a/libcutils/fs.c b/libcutils/fs.c index 1622ed927..c49233e8c 100644 --- a/libcutils/fs.c +++ b/libcutils/fs.c @@ -25,6 +25,7 @@ #include <errno.h> #include <fcntl.h> #include <limits.h> +#include <stdio.h> #include <stdlib.h> #include <string.h> #include <sys/stat.h> diff --git a/libcutils/sched_policy.c b/libcutils/sched_policy.c index 2cc72a691..cab926394 100644 --- a/libcutils/sched_policy.c +++ b/libcutils/sched_policy.c @@ -23,7 +23,7 @@ #include <string.h> #include <unistd.h> -#include <android/log.h> +#include <log/log.h> #include <cutils/sched_policy.h> #define UNUSED __attribute__((__unused__)) diff --git a/libcutils/sockets_unix.cpp b/libcutils/sockets_unix.cpp index e51a1c7a2..3545403aa 100644 --- a/libcutils/sockets_unix.cpp +++ b/libcutils/sockets_unix.cpp @@ -14,7 +14,11 @@ * limitations under the License. */ +#define LOG_TAG "socket-unix" + #include <sys/uio.h> +#include <time.h> +#include <unistd.h> #include <android/log.h> #include <cutils/sockets.h> |