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 /trusty | |
| 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 'trusty')
| -rw-r--r-- | trusty/gatekeeper/trusty_gatekeeper_ipc.c | 2 | ||||
| -rw-r--r-- | trusty/keymaster/trusty_keymaster_ipc.c | 1 | ||||
| -rw-r--r-- | trusty/libtrusty/trusty.c | 2 | ||||
| -rw-r--r-- | trusty/nvram/trusty_nvram_implementation.cpp | 1 | ||||
| -rw-r--r-- | trusty/storage/proxy/ipc.c | 1 | ||||
| -rw-r--r-- | trusty/storage/proxy/rpmb.c | 1 |
6 files changed, 8 insertions, 0 deletions
diff --git a/trusty/gatekeeper/trusty_gatekeeper_ipc.c b/trusty/gatekeeper/trusty_gatekeeper_ipc.c index ae536c539..45e65a7a0 100644 --- a/trusty/gatekeeper/trusty_gatekeeper_ipc.c +++ b/trusty/gatekeeper/trusty_gatekeeper_ipc.c @@ -17,8 +17,10 @@ #define LOG_TAG "TrustyGateKeeper" #include <errno.h> +#include <stdio.h> #include <stdlib.h> #include <string.h> +#include <unistd.h> #include <android/log.h> #include <trusty/tipc.h> diff --git a/trusty/keymaster/trusty_keymaster_ipc.c b/trusty/keymaster/trusty_keymaster_ipc.c index 0159bcead..87550936f 100644 --- a/trusty/keymaster/trusty_keymaster_ipc.c +++ b/trusty/keymaster/trusty_keymaster_ipc.c @@ -21,6 +21,7 @@ #include <errno.h> #include <stdlib.h> #include <string.h> +#include <unistd.h> #include <android/log.h> #include <trusty/tipc.h> diff --git a/trusty/libtrusty/trusty.c b/trusty/libtrusty/trusty.c index ba16bee4a..2398a538b 100644 --- a/trusty/libtrusty/trusty.c +++ b/trusty/libtrusty/trusty.c @@ -22,6 +22,8 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> +#include <sys/ioctl.h> +#include <unistd.h> #include <android/log.h> diff --git a/trusty/nvram/trusty_nvram_implementation.cpp b/trusty/nvram/trusty_nvram_implementation.cpp index caa25abf7..ddaf333d9 100644 --- a/trusty/nvram/trusty_nvram_implementation.cpp +++ b/trusty/nvram/trusty_nvram_implementation.cpp @@ -20,6 +20,7 @@ #include <errno.h> #include <string.h> +#include <unistd.h> #include <android/log.h> #include <hardware/nvram.h> diff --git a/trusty/storage/proxy/ipc.c b/trusty/storage/proxy/ipc.c index b4748e209..57cf600b6 100644 --- a/trusty/storage/proxy/ipc.c +++ b/trusty/storage/proxy/ipc.c @@ -20,6 +20,7 @@ #include <stdlib.h> #include <string.h> #include <sys/uio.h> +#include <unistd.h> #include <trusty/tipc.h> diff --git a/trusty/storage/proxy/rpmb.c b/trusty/storage/proxy/rpmb.c index 91304583a..9c7910585 100644 --- a/trusty/storage/proxy/rpmb.c +++ b/trusty/storage/proxy/rpmb.c @@ -21,6 +21,7 @@ #include <stdlib.h> #include <string.h> #include <sys/ioctl.h> +#include <unistd.h> #include <linux/major.h> #include <linux/mmc/ioctl.h> |