diff options
| author | Mark Salyzyn <salyzyn@google.com> | 2017-01-10 13:19:54 -0800 |
|---|---|---|
| committer | Mark Salyzyn <salyzyn@google.com> | 2017-01-11 09:31:15 -0800 |
| commit | 30f991f251940be3ed11566fb71139852286f68a (patch) | |
| tree | 5cef5c112aa400da1ad1572d26fcc3b6b3099b6e /trusty | |
| parent | cdd7ec12be3dfb6a7fa2f597d2220445c96725cf (diff) | |
| download | system_core-30f991f251940be3ed11566fb71139852286f68a.tar.gz system_core-30f991f251940be3ed11566fb71139852286f68a.tar.bz2 system_core-30f991f251940be3ed11566fb71139852286f68a.zip | |
liblog: use log/log.h when utilizing ALOG macros
Test: compile
Bug: 30465923
Change-Id: Id6d76510819ebd88c3f5003d00d73a0dbe85e943
Diffstat (limited to 'trusty')
| -rw-r--r-- | trusty/gatekeeper/trusty_gatekeeper.cpp | 3 | ||||
| -rw-r--r-- | trusty/gatekeeper/trusty_gatekeeper_ipc.c | 2 | ||||
| -rw-r--r-- | trusty/keymaster/trusty_keymaster_device.cpp | 2 | ||||
| -rw-r--r-- | trusty/keymaster/trusty_keymaster_ipc.c | 2 | ||||
| -rw-r--r-- | trusty/libtrusty/trusty.c | 2 | ||||
| -rw-r--r-- | trusty/nvram/trusty_nvram_implementation.cpp | 2 | ||||
| -rw-r--r-- | trusty/storage/lib/storage.c | 2 |
7 files changed, 8 insertions, 7 deletions
diff --git a/trusty/gatekeeper/trusty_gatekeeper.cpp b/trusty/gatekeeper/trusty_gatekeeper.cpp index 7e55fb1eb..b3fbfa940 100644 --- a/trusty/gatekeeper/trusty_gatekeeper.cpp +++ b/trusty/gatekeeper/trusty_gatekeeper.cpp @@ -19,9 +19,10 @@ #include <assert.h> #include <errno.h> #include <stdio.h> + #include <type_traits> -#include <android/log.h> +#include <log/log.h> #include "trusty_gatekeeper.h" #include "trusty_gatekeeper_ipc.h" diff --git a/trusty/gatekeeper/trusty_gatekeeper_ipc.c b/trusty/gatekeeper/trusty_gatekeeper_ipc.c index 45e65a7a0..f67944b35 100644 --- a/trusty/gatekeeper/trusty_gatekeeper_ipc.c +++ b/trusty/gatekeeper/trusty_gatekeeper_ipc.c @@ -22,7 +22,7 @@ #include <string.h> #include <unistd.h> -#include <android/log.h> +#include <log/log.h> #include <trusty/tipc.h> #include "trusty_gatekeeper_ipc.h" diff --git a/trusty/keymaster/trusty_keymaster_device.cpp b/trusty/keymaster/trusty_keymaster_device.cpp index de5e46335..1368f8803 100644 --- a/trusty/keymaster/trusty_keymaster_device.cpp +++ b/trusty/keymaster/trusty_keymaster_device.cpp @@ -27,9 +27,9 @@ #include <type_traits> -#include <android/log.h> #include <hardware/keymaster0.h> #include <keymaster/authorization_set.h> +#include <log/log.h> #include "trusty_keymaster_device.h" #include "trusty_keymaster_ipc.h" diff --git a/trusty/keymaster/trusty_keymaster_ipc.c b/trusty/keymaster/trusty_keymaster_ipc.c index 87550936f..88546af28 100644 --- a/trusty/keymaster/trusty_keymaster_ipc.c +++ b/trusty/keymaster/trusty_keymaster_ipc.c @@ -23,7 +23,7 @@ #include <string.h> #include <unistd.h> -#include <android/log.h> +#include <log/log.h> #include <trusty/tipc.h> #include "trusty_keymaster_ipc.h" diff --git a/trusty/libtrusty/trusty.c b/trusty/libtrusty/trusty.c index 2398a538b..a6238af7d 100644 --- a/trusty/libtrusty/trusty.c +++ b/trusty/libtrusty/trusty.c @@ -25,7 +25,7 @@ #include <sys/ioctl.h> #include <unistd.h> -#include <android/log.h> +#include <log/log.h> #include "tipc_ioctl.h" diff --git a/trusty/nvram/trusty_nvram_implementation.cpp b/trusty/nvram/trusty_nvram_implementation.cpp index ddaf333d9..9215c8502 100644 --- a/trusty/nvram/trusty_nvram_implementation.cpp +++ b/trusty/nvram/trusty_nvram_implementation.cpp @@ -22,8 +22,8 @@ #include <string.h> #include <unistd.h> -#include <android/log.h> #include <hardware/nvram.h> +#include <log/log.h> #include <trusty/tipc.h> #include <nvram/messages/blob.h> diff --git a/trusty/storage/lib/storage.c b/trusty/storage/lib/storage.c index 3002c0bde..915bc17d4 100644 --- a/trusty/storage/lib/storage.c +++ b/trusty/storage/lib/storage.c @@ -23,7 +23,7 @@ #include <string.h> #include <sys/uio.h> -#include <android/log.h> +#include <log/log.h> #include <trusty/tipc.h> #include <trusty/lib/storage.h> |