summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Salyzyn2017-01-10 15:19:54 -0600
committerMark Salyzyn2017-01-11 11:31:15 -0600
commit30f991f251940be3ed11566fb71139852286f68a (patch)
tree5cef5c112aa400da1ad1572d26fcc3b6b3099b6e
parentcdd7ec12be3dfb6a7fa2f597d2220445c96725cf (diff)
downloadplatform-system-core-30f991f251940be3ed11566fb71139852286f68a.tar.gz
platform-system-core-30f991f251940be3ed11566fb71139852286f68a.tar.xz
platform-system-core-30f991f251940be3ed11566fb71139852286f68a.zip
liblog: use log/log.h when utilizing ALOG macros
Test: compile Bug: 30465923 Change-Id: Id6d76510819ebd88c3f5003d00d73a0dbe85e943
-rw-r--r--adf/libadfhwc/adfhwc.cpp2
-rw-r--r--debuggerd/arm/machine.cpp2
-rw-r--r--debuggerd/arm64/machine.cpp2
-rw-r--r--debuggerd/backtrace.cpp2
-rw-r--r--debuggerd/debuggerd.cpp2
-rw-r--r--debuggerd/elf_utils.cpp2
-rw-r--r--debuggerd/mips/machine.cpp2
-rw-r--r--debuggerd/mips64/machine.cpp2
-rw-r--r--debuggerd/open_files_list.cpp2
-rw-r--r--debuggerd/signal_sender.cpp2
-rw-r--r--debuggerd/x86/machine.cpp2
-rw-r--r--debuggerd/x86_64/machine.cpp4
-rw-r--r--fingerprintd/fingerprintd.cpp2
-rw-r--r--gatekeeperd/gatekeeperd.cpp2
-rw-r--r--libbacktrace/BacktraceLog.h2
-rw-r--r--libbacktrace/BacktraceMap.cpp3
-rw-r--r--libcutils/ashmem-dev.c2
-rw-r--r--libcutils/debugger.c2
-rw-r--r--libcutils/dlmalloc_stubs.c2
-rw-r--r--libcutils/fs.c2
-rw-r--r--libcutils/fs_config.c2
-rw-r--r--libcutils/properties.c2
-rw-r--r--libcutils/qtaguid.c2
-rw-r--r--libcutils/sockets_unix.cpp2
-rw-r--r--libcutils/str_parms.c2
-rw-r--r--libdiskconfig/config_mbr.c2
-rw-r--r--libdiskconfig/diskconfig.c2
-rw-r--r--libdiskconfig/diskutils.c2
-rw-r--r--libdiskconfig/dump_diskconfig.c2
-rw-r--r--libdiskconfig/write_lst.c2
-rw-r--r--libion/ion.c2
-rw-r--r--libmemtrack/memtrack.c2
-rw-r--r--libmemunreachable/log.h2
-rw-r--r--libnativebridge/native_bridge.cc2
-rw-r--r--libnativeloader/native_loader.cpp4
-rw-r--r--libnetutils/dhcpclient.c2
-rw-r--r--libnetutils/ifc_utils.c2
-rw-r--r--libnetutils/packet.c2
-rw-r--r--libpackagelistparser/packagelistparser.c2
-rw-r--r--libpixelflinger/codeflinger/ARMAssembler.cpp2
-rw-r--r--libpixelflinger/codeflinger/ARMAssemblerInterface.cpp2
-rw-r--r--libpixelflinger/codeflinger/Arm64Assembler.cpp2
-rw-r--r--libpixelflinger/codeflinger/CodeCache.cpp2
-rw-r--r--libpixelflinger/codeflinger/GGLAssembler.cpp2
-rw-r--r--libpixelflinger/codeflinger/MIPS64Assembler.cpp2
-rw-r--r--libpixelflinger/codeflinger/MIPSAssembler.cpp3
-rw-r--r--libpixelflinger/codeflinger/blending.cpp2
-rw-r--r--libpixelflinger/codeflinger/load_store.cpp2
-rw-r--r--libpixelflinger/codeflinger/texturing.cpp2
-rw-r--r--libpixelflinger/scanline.cpp2
-rw-r--r--libpixelflinger/trap.cpp2
-rw-r--r--libsuspend/autosuspend.c2
-rw-r--r--libsuspend/autosuspend_autosleep.c2
-rw-r--r--libsuspend/autosuspend_earlysuspend.c2
-rw-r--r--libsuspend/autosuspend_wakeup_count.c2
-rw-r--r--libutils/Looper.cpp2
-rw-r--r--libutils/SharedBuffer.cpp2
-rw-r--r--libutils/Unicode.cpp2
-rw-r--r--libutils/VectorImpl.cpp2
-rw-r--r--libziparchive/zip_archive_stream_entry.cc3
-rw-r--r--lmkd/lmkd.c2
-rw-r--r--logwrapper/logwrap.c2
-rw-r--r--logwrapper/logwrapper.c2
-rw-r--r--trusty/gatekeeper/trusty_gatekeeper.cpp3
-rw-r--r--trusty/gatekeeper/trusty_gatekeeper_ipc.c2
-rw-r--r--trusty/keymaster/trusty_keymaster_device.cpp2
-rw-r--r--trusty/keymaster/trusty_keymaster_ipc.c2
-rw-r--r--trusty/libtrusty/trusty.c2
-rw-r--r--trusty/nvram/trusty_nvram_implementation.cpp2
-rw-r--r--trusty/storage/lib/storage.c2
70 files changed, 75 insertions, 73 deletions
diff --git a/adf/libadfhwc/adfhwc.cpp b/adf/libadfhwc/adfhwc.cpp
index 7d5b55514..a97862a14 100644
--- a/adf/libadfhwc/adfhwc.cpp
+++ b/adf/libadfhwc/adfhwc.cpp
@@ -20,7 +20,7 @@
20#include <pthread.h> 20#include <pthread.h>
21#include <sys/resource.h> 21#include <sys/resource.h>
22 22
23#include <android/log.h> 23#include <log/log.h>
24#include <utils/Vector.h> 24#include <utils/Vector.h>
25 25
26#include <adf/adf.h> 26#include <adf/adf.h>
diff --git a/debuggerd/arm/machine.cpp b/debuggerd/arm/machine.cpp
index 292edcba0..78c230615 100644
--- a/debuggerd/arm/machine.cpp
+++ b/debuggerd/arm/machine.cpp
@@ -22,8 +22,8 @@
22#include <string.h> 22#include <string.h>
23#include <sys/ptrace.h> 23#include <sys/ptrace.h>
24 24
25#include <android/log.h>
26#include <backtrace/Backtrace.h> 25#include <backtrace/Backtrace.h>
26#include <log/log.h>
27 27
28#include "machine.h" 28#include "machine.h"
29#include "utility.h" 29#include "utility.h"
diff --git a/debuggerd/arm64/machine.cpp b/debuggerd/arm64/machine.cpp
index cd1bd528c..e7bf79a8f 100644
--- a/debuggerd/arm64/machine.cpp
+++ b/debuggerd/arm64/machine.cpp
@@ -24,8 +24,8 @@
24#include <sys/ptrace.h> 24#include <sys/ptrace.h>
25#include <sys/uio.h> 25#include <sys/uio.h>
26 26
27#include <android/log.h>
28#include <backtrace/Backtrace.h> 27#include <backtrace/Backtrace.h>
28#include <log/log.h>
29 29
30#include "machine.h" 30#include "machine.h"
31#include "utility.h" 31#include "utility.h"
diff --git a/debuggerd/backtrace.cpp b/debuggerd/backtrace.cpp
index 06c1efeca..066444242 100644
--- a/debuggerd/backtrace.cpp
+++ b/debuggerd/backtrace.cpp
@@ -31,8 +31,8 @@
31#include <memory> 31#include <memory>
32#include <string> 32#include <string>
33 33
34#include <android/log.h>
35#include <backtrace/Backtrace.h> 34#include <backtrace/Backtrace.h>
35#include <log/log.h>
36 36
37#include "backtrace.h" 37#include "backtrace.h"
38 38
diff --git a/debuggerd/debuggerd.cpp b/debuggerd/debuggerd.cpp
index 9b82f6483..893adc860 100644
--- a/debuggerd/debuggerd.cpp
+++ b/debuggerd/debuggerd.cpp
@@ -42,12 +42,12 @@
42 42
43#include <selinux/android.h> 43#include <selinux/android.h>
44 44
45#include <android/log.h>
46#include <android-base/file.h> 45#include <android-base/file.h>
47#include <android-base/unique_fd.h> 46#include <android-base/unique_fd.h>
48#include <cutils/debugger.h> 47#include <cutils/debugger.h>
49#include <cutils/properties.h> 48#include <cutils/properties.h>
50#include <cutils/sockets.h> 49#include <cutils/sockets.h>
50#include <log/log.h>
51 51
52#include <private/android_filesystem_config.h> 52#include <private/android_filesystem_config.h>
53 53
diff --git a/debuggerd/elf_utils.cpp b/debuggerd/elf_utils.cpp
index d760a37da..4e798e243 100644
--- a/debuggerd/elf_utils.cpp
+++ b/debuggerd/elf_utils.cpp
@@ -23,9 +23,9 @@
23 23
24#include <string> 24#include <string>
25 25
26#include <android/log.h>
27#include <android-base/stringprintf.h> 26#include <android-base/stringprintf.h>
28#include <backtrace/Backtrace.h> 27#include <backtrace/Backtrace.h>
28#include <log/log.h>
29 29
30#include "elf_utils.h" 30#include "elf_utils.h"
31 31
diff --git a/debuggerd/mips/machine.cpp b/debuggerd/mips/machine.cpp
index 99a9d65a5..cbf272a36 100644
--- a/debuggerd/mips/machine.cpp
+++ b/debuggerd/mips/machine.cpp
@@ -22,8 +22,8 @@
22#include <string.h> 22#include <string.h>
23#include <sys/ptrace.h> 23#include <sys/ptrace.h>
24 24
25#include <android/log.h>
26#include <backtrace/Backtrace.h> 25#include <backtrace/Backtrace.h>
26#include <log/log.h>
27 27
28#include "machine.h" 28#include "machine.h"
29#include "utility.h" 29#include "utility.h"
diff --git a/debuggerd/mips64/machine.cpp b/debuggerd/mips64/machine.cpp
index ecd1ca2c8..0a8d53257 100644
--- a/debuggerd/mips64/machine.cpp
+++ b/debuggerd/mips64/machine.cpp
@@ -22,8 +22,8 @@
22#include <string.h> 22#include <string.h>
23#include <sys/ptrace.h> 23#include <sys/ptrace.h>
24 24
25#include <android/log.h>
26#include <backtrace/Backtrace.h> 25#include <backtrace/Backtrace.h>
26#include <log/log.h>
27 27
28#include "machine.h" 28#include "machine.h"
29#include "utility.h" 29#include "utility.h"
diff --git a/debuggerd/open_files_list.cpp b/debuggerd/open_files_list.cpp
index 5ef2abc2f..5c7ea7083 100644
--- a/debuggerd/open_files_list.cpp
+++ b/debuggerd/open_files_list.cpp
@@ -29,7 +29,7 @@
29#include <vector> 29#include <vector>
30 30
31#include <android-base/file.h> 31#include <android-base/file.h>
32#include <android/log.h> 32#include <log/log.h>
33 33
34#include "open_files_list.h" 34#include "open_files_list.h"
35 35
diff --git a/debuggerd/signal_sender.cpp b/debuggerd/signal_sender.cpp
index 7fe4dee6f..42a8e7717 100644
--- a/debuggerd/signal_sender.cpp
+++ b/debuggerd/signal_sender.cpp
@@ -27,7 +27,7 @@
27#include <sys/wait.h> 27#include <sys/wait.h>
28#include <unistd.h> 28#include <unistd.h>
29 29
30#include <android/log.h> 30#include <log/log.h>
31 31
32#include "signal_sender.h" 32#include "signal_sender.h"
33 33
diff --git a/debuggerd/x86/machine.cpp b/debuggerd/x86/machine.cpp
index a6f21e1fc..af10817a4 100644
--- a/debuggerd/x86/machine.cpp
+++ b/debuggerd/x86/machine.cpp
@@ -21,8 +21,8 @@
21#include <string.h> 21#include <string.h>
22#include <sys/ptrace.h> 22#include <sys/ptrace.h>
23 23
24#include <android/log.h>
25#include <backtrace/Backtrace.h> 24#include <backtrace/Backtrace.h>
25#include <log/log.h>
26 26
27#include "machine.h" 27#include "machine.h"
28#include "utility.h" 28#include "utility.h"
diff --git a/debuggerd/x86_64/machine.cpp b/debuggerd/x86_64/machine.cpp
index 705e12df3..bf2c2b4e0 100644
--- a/debuggerd/x86_64/machine.cpp
+++ b/debuggerd/x86_64/machine.cpp
@@ -18,12 +18,12 @@
18 18
19#include <errno.h> 19#include <errno.h>
20#include <stdint.h> 20#include <stdint.h>
21#include <sys/ptrace.h>
22#include <string.h> 21#include <string.h>
22#include <sys/ptrace.h>
23#include <sys/user.h> 23#include <sys/user.h>
24 24
25#include <android/log.h>
26#include <backtrace/Backtrace.h> 25#include <backtrace/Backtrace.h>
26#include <log/log.h>
27 27
28#include "machine.h" 28#include "machine.h"
29#include "utility.h" 29#include "utility.h"
diff --git a/fingerprintd/fingerprintd.cpp b/fingerprintd/fingerprintd.cpp
index 05109b7d1..2fc2d0aec 100644
--- a/fingerprintd/fingerprintd.cpp
+++ b/fingerprintd/fingerprintd.cpp
@@ -16,7 +16,6 @@
16 16
17#define LOG_TAG "fingerprintd" 17#define LOG_TAG "fingerprintd"
18 18
19#include <android/log.h>
20#include <binder/IPCThreadState.h> 19#include <binder/IPCThreadState.h>
21#include <binder/IServiceManager.h> 20#include <binder/IServiceManager.h>
22#include <binder/PermissionCache.h> 21#include <binder/PermissionCache.h>
@@ -25,6 +24,7 @@
25#include <hardware/hw_auth_token.h> 24#include <hardware/hw_auth_token.h>
26#include <keystore/IKeystoreService.h> 25#include <keystore/IKeystoreService.h>
27#include <keystore/keystore.h> // for error codes 26#include <keystore/keystore.h> // for error codes
27#include <log/log.h>
28#include <utils/Log.h> 28#include <utils/Log.h>
29#include <utils/String16.h> 29#include <utils/String16.h>
30 30
diff --git a/gatekeeperd/gatekeeperd.cpp b/gatekeeperd/gatekeeperd.cpp
index 4107f553e..d4a92e57d 100644
--- a/gatekeeperd/gatekeeperd.cpp
+++ b/gatekeeperd/gatekeeperd.cpp
@@ -24,7 +24,6 @@
24#include <stdint.h> 24#include <stdint.h>
25#include <unistd.h> 25#include <unistd.h>
26 26
27#include <android/log.h>
28#include <binder/IPCThreadState.h> 27#include <binder/IPCThreadState.h>
29#include <binder/IServiceManager.h> 28#include <binder/IServiceManager.h>
30#include <binder/PermissionCache.h> 29#include <binder/PermissionCache.h>
@@ -33,6 +32,7 @@
33#include <hardware/hw_auth_token.h> 32#include <hardware/hw_auth_token.h>
34#include <keystore/IKeystoreService.h> 33#include <keystore/IKeystoreService.h>
35#include <keystore/keystore.h> // For error code 34#include <keystore/keystore.h> // For error code
35#include <log/log.h>
36#include <utils/Log.h> 36#include <utils/Log.h>
37#include <utils/String16.h> 37#include <utils/String16.h>
38 38
diff --git a/libbacktrace/BacktraceLog.h b/libbacktrace/BacktraceLog.h
index 0a2798202..5c39f1c04 100644
--- a/libbacktrace/BacktraceLog.h
+++ b/libbacktrace/BacktraceLog.h
@@ -19,7 +19,7 @@
19 19
20#define LOG_TAG "libbacktrace" 20#define LOG_TAG "libbacktrace"
21 21
22#include <android/log.h> 22#include <log/log.h>
23 23
24// Macro to log the function name along with the warning message. 24// Macro to log the function name along with the warning message.
25#define BACK_LOGW(format, ...) \ 25#define BACK_LOGW(format, ...) \
diff --git a/libbacktrace/BacktraceMap.cpp b/libbacktrace/BacktraceMap.cpp
index 449637553..0e314958f 100644
--- a/libbacktrace/BacktraceMap.cpp
+++ b/libbacktrace/BacktraceMap.cpp
@@ -22,7 +22,8 @@
22#include <sys/types.h> 22#include <sys/types.h>
23#include <unistd.h> 23#include <unistd.h>
24 24
25#include <android/log.h> 25#include <log/log.h>
26
26#include <backtrace/backtrace_constants.h> 27#include <backtrace/backtrace_constants.h>
27#include <backtrace/BacktraceMap.h> 28#include <backtrace/BacktraceMap.h>
28 29
diff --git a/libcutils/ashmem-dev.c b/libcutils/ashmem-dev.c
index db4ed11d1..92717c043 100644
--- a/libcutils/ashmem-dev.c
+++ b/libcutils/ashmem-dev.c
@@ -31,8 +31,8 @@
31#include <sys/types.h> 31#include <sys/types.h>
32#include <unistd.h> 32#include <unistd.h>
33 33
34#include <android/log.h>
35#include <cutils/ashmem.h> 34#include <cutils/ashmem.h>
35#include <log/log.h>
36 36
37#define ASHMEM_DEVICE "/dev/ashmem" 37#define ASHMEM_DEVICE "/dev/ashmem"
38 38
diff --git a/libcutils/debugger.c b/libcutils/debugger.c
index c6bdd1a6a..32fac98b7 100644
--- a/libcutils/debugger.c
+++ b/libcutils/debugger.c
@@ -25,9 +25,9 @@
25#include <sys/types.h> 25#include <sys/types.h>
26#include <unistd.h> 26#include <unistd.h>
27 27
28#include <android/log.h>
29#include <cutils/debugger.h> 28#include <cutils/debugger.h>
30#include <cutils/sockets.h> 29#include <cutils/sockets.h>
30#include <log/log.h>
31 31
32static int send_request(int sock_fd, void* msg_ptr, size_t msg_len) { 32static int send_request(int sock_fd, void* msg_ptr, size_t msg_len) {
33 int result = 0; 33 int result = 0;
diff --git a/libcutils/dlmalloc_stubs.c b/libcutils/dlmalloc_stubs.c
index 6c07bed9a..2cff9dd01 100644
--- a/libcutils/dlmalloc_stubs.c
+++ b/libcutils/dlmalloc_stubs.c
@@ -16,7 +16,7 @@
16 16
17#define LOG_TAG "dlmalloc-stubs" 17#define LOG_TAG "dlmalloc-stubs"
18 18
19#include "android/log.h" 19#include "log/log.h"
20 20
21#define UNUSED __attribute__((__unused__)) 21#define UNUSED __attribute__((__unused__))
22 22
diff --git a/libcutils/fs.c b/libcutils/fs.c
index c49233e8c..488fdfc28 100644
--- a/libcutils/fs.c
+++ b/libcutils/fs.c
@@ -32,8 +32,8 @@
32#include <sys/types.h> 32#include <sys/types.h>
33#include <unistd.h> 33#include <unistd.h>
34 34
35#include <android/log.h>
36#include <cutils/fs.h> 35#include <cutils/fs.h>
36#include <log/log.h>
37 37
38#define ALL_PERMS (S_ISUID | S_ISGID | S_ISVTX | S_IRWXU | S_IRWXG | S_IRWXO) 38#define ALL_PERMS (S_ISUID | S_ISGID | S_ISVTX | S_IRWXU | S_IRWXG | S_IRWXO)
39#define BUF_SIZE 64 39#define BUF_SIZE 64
diff --git a/libcutils/fs_config.c b/libcutils/fs_config.c
index 6155d1693..9f46a621a 100644
--- a/libcutils/fs_config.c
+++ b/libcutils/fs_config.c
@@ -33,7 +33,7 @@
33#include <sys/stat.h> 33#include <sys/stat.h>
34#include <sys/types.h> 34#include <sys/types.h>
35 35
36#include <android/log.h> 36#include <log/log.h>
37#include <private/android_filesystem_config.h> 37#include <private/android_filesystem_config.h>
38#include <utils/Compat.h> 38#include <utils/Compat.h>
39 39
diff --git a/libcutils/properties.c b/libcutils/properties.c
index 740c7a97a..bdbddd023 100644
--- a/libcutils/properties.c
+++ b/libcutils/properties.c
@@ -26,9 +26,9 @@
26#include <string.h> 26#include <string.h>
27#include <unistd.h> 27#include <unistd.h>
28 28
29#include <android/log.h>
30#include <cutils/properties.h> 29#include <cutils/properties.h>
31#include <cutils/sockets.h> 30#include <cutils/sockets.h>
31#include <log/log.h>
32 32
33int8_t property_get_bool(const char *key, int8_t default_value) { 33int8_t property_get_bool(const char *key, int8_t default_value) {
34 if (!key) { 34 if (!key) {
diff --git a/libcutils/qtaguid.c b/libcutils/qtaguid.c
index ae5a50300..22b83253f 100644
--- a/libcutils/qtaguid.c
+++ b/libcutils/qtaguid.c
@@ -26,7 +26,7 @@
26#include <string.h> 26#include <string.h>
27#include <unistd.h> 27#include <unistd.h>
28 28
29#include <android/log.h> 29#include <log/log.h>
30#include <cutils/qtaguid.h> 30#include <cutils/qtaguid.h>
31 31
32static const char* CTRL_PROCPATH = "/proc/net/xt_qtaguid/ctrl"; 32static const char* CTRL_PROCPATH = "/proc/net/xt_qtaguid/ctrl";
diff --git a/libcutils/sockets_unix.cpp b/libcutils/sockets_unix.cpp
index 5a14a5c5e..e91f35831 100644
--- a/libcutils/sockets_unix.cpp
+++ b/libcutils/sockets_unix.cpp
@@ -25,9 +25,9 @@
25#include <time.h> 25#include <time.h>
26#include <unistd.h> 26#include <unistd.h>
27 27
28#include <android/log.h>
29#include <cutils/android_get_control_file.h> 28#include <cutils/android_get_control_file.h>
30#include <cutils/sockets.h> 29#include <cutils/sockets.h>
30#include <log/log.h>
31 31
32#include "android_get_control_env.h" 32#include "android_get_control_env.h"
33 33
diff --git a/libcutils/str_parms.c b/libcutils/str_parms.c
index 6bb7e581c..8dafdedac 100644
--- a/libcutils/str_parms.c
+++ b/libcutils/str_parms.c
@@ -24,10 +24,10 @@
24#include <stdlib.h> 24#include <stdlib.h>
25#include <string.h> 25#include <string.h>
26 26
27#include <android/log.h>
28#include <cutils/hashmap.h> 27#include <cutils/hashmap.h>
29#include <cutils/memory.h> 28#include <cutils/memory.h>
30#include <cutils/str_parms.h> 29#include <cutils/str_parms.h>
30#include <log/log.h>
31 31
32#define UNUSED __attribute__((unused)) 32#define UNUSED __attribute__((unused))
33 33
diff --git a/libdiskconfig/config_mbr.c b/libdiskconfig/config_mbr.c
index 1d3cd200a..ace9bbfb1 100644
--- a/libdiskconfig/config_mbr.c
+++ b/libdiskconfig/config_mbr.c
@@ -22,8 +22,8 @@
22#include <stdlib.h> 22#include <stdlib.h>
23#include <string.h> 23#include <string.h>
24 24
25#include <android/log.h>
26#include <diskconfig/diskconfig.h> 25#include <diskconfig/diskconfig.h>
26#include <log/log.h>
27 27
28/* start and len are in LBA units */ 28/* start and len are in LBA units */
29static void 29static void
diff --git a/libdiskconfig/diskconfig.c b/libdiskconfig/diskconfig.c
index 2d59ad996..c7e1b4374 100644
--- a/libdiskconfig/diskconfig.c
+++ b/libdiskconfig/diskconfig.c
@@ -28,8 +28,8 @@
28#include <sys/stat.h> 28#include <sys/stat.h>
29#include <unistd.h> 29#include <unistd.h>
30 30
31#include <android/log.h>
32#include <cutils/config_utils.h> 31#include <cutils/config_utils.h>
32#include <log/log.h>
33 33
34#include <diskconfig/diskconfig.h> 34#include <diskconfig/diskconfig.h>
35 35
diff --git a/libdiskconfig/diskutils.c b/libdiskconfig/diskutils.c
index 3a2760155..fe1b4c180 100644
--- a/libdiskconfig/diskutils.c
+++ b/libdiskconfig/diskutils.c
@@ -26,7 +26,7 @@
26#include <sys/stat.h> 26#include <sys/stat.h>
27#include <unistd.h> 27#include <unistd.h>
28 28
29#include <android/log.h> 29#include <log/log.h>
30 30
31#include <diskconfig/diskconfig.h> 31#include <diskconfig/diskconfig.h>
32 32
diff --git a/libdiskconfig/dump_diskconfig.c b/libdiskconfig/dump_diskconfig.c
index c94e7f49e..3c4f62005 100644
--- a/libdiskconfig/dump_diskconfig.c
+++ b/libdiskconfig/dump_diskconfig.c
@@ -19,7 +19,7 @@
19 19
20#include <stdio.h> 20#include <stdio.h>
21 21
22#include <android/log.h> 22#include <log/log.h>
23 23
24#include "diskconfig.h" 24#include "diskconfig.h"
25 25
diff --git a/libdiskconfig/write_lst.c b/libdiskconfig/write_lst.c
index 21d4a3108..c3d5c0ac1 100644
--- a/libdiskconfig/write_lst.c
+++ b/libdiskconfig/write_lst.c
@@ -23,8 +23,8 @@
23#include <sys/types.h> 23#include <sys/types.h>
24#include <unistd.h> 24#include <unistd.h>
25 25
26#include <android/log.h>
27#include <diskconfig/diskconfig.h> 26#include <diskconfig/diskconfig.h>
27#include <log/log.h>
28 28
29struct write_list * 29struct write_list *
30alloc_wl(uint32_t data_len) 30alloc_wl(uint32_t data_len)
diff --git a/libion/ion.c b/libion/ion.c
index a7b22b839..9aaa6f28e 100644
--- a/libion/ion.c
+++ b/libion/ion.c
@@ -29,8 +29,8 @@
29#include <sys/types.h> 29#include <sys/types.h>
30#include <unistd.h> 30#include <unistd.h>
31 31
32#include <android/log.h>
33#include <ion/ion.h> 32#include <ion/ion.h>
33#include <log/log.h>
34 34
35int ion_open() 35int ion_open()
36{ 36{
diff --git a/libmemtrack/memtrack.c b/libmemtrack/memtrack.c
index 29cc92c83..9ed945147 100644
--- a/libmemtrack/memtrack.c
+++ b/libmemtrack/memtrack.c
@@ -22,8 +22,8 @@
22#include <malloc.h> 22#include <malloc.h>
23#include <string.h> 23#include <string.h>
24 24
25#include <android/log.h>
26#include <hardware/memtrack.h> 25#include <hardware/memtrack.h>
26#include <log/log.h>
27 27
28#define ARRAY_SIZE(x) (sizeof(x)/sizeof((x)[0])) 28#define ARRAY_SIZE(x) (sizeof(x)/sizeof((x)[0]))
29 29
diff --git a/libmemunreachable/log.h b/libmemunreachable/log.h
index dd146b65a..cdfbfd9d6 100644
--- a/libmemunreachable/log.h
+++ b/libmemunreachable/log.h
@@ -19,6 +19,6 @@
19 19
20#define LOG_TAG "libmemunreachable" 20#define LOG_TAG "libmemunreachable"
21 21
22#include <android/log.h> 22#include <log/log.h>
23 23
24#endif // LIBMEMUNREACHABLE_LOG_H_ 24#endif // LIBMEMUNREACHABLE_LOG_H_
diff --git a/libnativebridge/native_bridge.cc b/libnativebridge/native_bridge.cc
index eafc53d8d..83f35b1e8 100644
--- a/libnativebridge/native_bridge.cc
+++ b/libnativebridge/native_bridge.cc
@@ -28,7 +28,7 @@
28 28
29#include <cstring> 29#include <cstring>
30 30
31#include <android/log.h> 31#include <log/log.h>
32 32
33namespace android { 33namespace android {
34 34
diff --git a/libnativeloader/native_loader.cpp b/libnativeloader/native_loader.cpp
index 15fe0540e..94c46fc19 100644
--- a/libnativeloader/native_loader.cpp
+++ b/libnativeloader/native_loader.cpp
@@ -19,10 +19,10 @@
19 19
20#include <dlfcn.h> 20#include <dlfcn.h>
21#ifdef __ANDROID__ 21#ifdef __ANDROID__
22#include "dlext_namespaces.h"
23#define LOG_TAG "libnativeloader" 22#define LOG_TAG "libnativeloader"
24#include "android/log.h" 23#include "dlext_namespaces.h"
25#include "cutils/properties.h" 24#include "cutils/properties.h"
25#include "log/log.h"
26#endif 26#endif
27#include "nativebridge/native_bridge.h" 27#include "nativebridge/native_bridge.h"
28 28
diff --git a/libnetutils/dhcpclient.c b/libnetutils/dhcpclient.c
index d17bdd3c2..11c116a51 100644
--- a/libnetutils/dhcpclient.c
+++ b/libnetutils/dhcpclient.c
@@ -31,8 +31,8 @@
31#include <time.h> 31#include <time.h>
32#include <unistd.h> 32#include <unistd.h>
33 33
34#include <android/log.h>
35#include <cutils/properties.h> 34#include <cutils/properties.h>
35#include <log/log.h>
36 36
37#include <netutils/ifc.h> 37#include <netutils/ifc.h>
38#include "dhcpmsg.h" 38#include "dhcpmsg.h"
diff --git a/libnetutils/ifc_utils.c b/libnetutils/ifc_utils.c
index 275327ab4..a098d596e 100644
--- a/libnetutils/ifc_utils.c
+++ b/libnetutils/ifc_utils.c
@@ -38,8 +38,8 @@
38 38
39#ifdef ANDROID 39#ifdef ANDROID
40#define LOG_TAG "NetUtils" 40#define LOG_TAG "NetUtils"
41#include <android/log.h>
42#include <cutils/properties.h> 41#include <cutils/properties.h>
42#include <log/log.h>
43#else 43#else
44#define ALOGD printf 44#define ALOGD printf
45#define ALOGW printf 45#define ALOGW printf
diff --git a/libnetutils/packet.c b/libnetutils/packet.c
index 56168e844..e53a4c84f 100644
--- a/libnetutils/packet.c
+++ b/libnetutils/packet.c
@@ -28,7 +28,7 @@
28 28
29#ifdef ANDROID 29#ifdef ANDROID
30#define LOG_TAG "DHCP" 30#define LOG_TAG "DHCP"
31#include <android/log.h> 31#include <log/log.h>
32#else 32#else
33#include <stdio.h> 33#include <stdio.h>
34#define ALOGD printf 34#define ALOGD printf
diff --git a/libpackagelistparser/packagelistparser.c b/libpackagelistparser/packagelistparser.c
index f74b8b495..3e1a3d193 100644
--- a/libpackagelistparser/packagelistparser.c
+++ b/libpackagelistparser/packagelistparser.c
@@ -27,7 +27,7 @@
27#include <string.h> 27#include <string.h>
28#include <sys/limits.h> 28#include <sys/limits.h>
29 29
30#include <android/log.h> 30#include <log/log.h>
31#include <packagelistparser/packagelistparser.h> 31#include <packagelistparser/packagelistparser.h>
32 32
33#define CLOGE(fmt, ...) \ 33#define CLOGE(fmt, ...) \
diff --git a/libpixelflinger/codeflinger/ARMAssembler.cpp b/libpixelflinger/codeflinger/ARMAssembler.cpp
index 36c1326f7..ac009a9be 100644
--- a/libpixelflinger/codeflinger/ARMAssembler.cpp
+++ b/libpixelflinger/codeflinger/ARMAssembler.cpp
@@ -20,8 +20,8 @@
20#include <stdio.h> 20#include <stdio.h>
21#include <stdlib.h> 21#include <stdlib.h>
22 22
23#include <android/log.h>
24#include <cutils/properties.h> 23#include <cutils/properties.h>
24#include <log/log.h>
25#include <private/pixelflinger/ggl_context.h> 25#include <private/pixelflinger/ggl_context.h>
26 26
27#include "ARMAssembler.h" 27#include "ARMAssembler.h"
diff --git a/libpixelflinger/codeflinger/ARMAssemblerInterface.cpp b/libpixelflinger/codeflinger/ARMAssemblerInterface.cpp
index e212f1ba2..c96cf4b02 100644
--- a/libpixelflinger/codeflinger/ARMAssemblerInterface.cpp
+++ b/libpixelflinger/codeflinger/ARMAssemblerInterface.cpp
@@ -21,7 +21,7 @@
21#include <stdlib.h> 21#include <stdlib.h>
22#include <sys/types.h> 22#include <sys/types.h>
23 23
24#include <android/log.h> 24#include <log/log.h>
25 25
26#include "ARMAssemblerInterface.h" 26#include "ARMAssemblerInterface.h"
27 27
diff --git a/libpixelflinger/codeflinger/Arm64Assembler.cpp b/libpixelflinger/codeflinger/Arm64Assembler.cpp
index fb297ec27..bff87bbac 100644
--- a/libpixelflinger/codeflinger/Arm64Assembler.cpp
+++ b/libpixelflinger/codeflinger/Arm64Assembler.cpp
@@ -32,8 +32,8 @@
32#include <stdlib.h> 32#include <stdlib.h>
33#include <string.h> 33#include <string.h>
34 34
35#include <android/log.h>
36#include <cutils/properties.h> 35#include <cutils/properties.h>
36#include <log/log.h>
37#include <private/pixelflinger/ggl_context.h> 37#include <private/pixelflinger/ggl_context.h>
38 38
39#include "codeflinger/Arm64Assembler.h" 39#include "codeflinger/Arm64Assembler.h"
diff --git a/libpixelflinger/codeflinger/CodeCache.cpp b/libpixelflinger/codeflinger/CodeCache.cpp
index 37bd0744e..851664070 100644
--- a/libpixelflinger/codeflinger/CodeCache.cpp
+++ b/libpixelflinger/codeflinger/CodeCache.cpp
@@ -23,8 +23,8 @@
23#include <sys/mman.h> 23#include <sys/mman.h>
24#include <unistd.h> 24#include <unistd.h>
25 25
26#include <android/log.h>
27#include <cutils/ashmem.h> 26#include <cutils/ashmem.h>
27#include <log/log.h>
28 28
29#include "CodeCache.h" 29#include "CodeCache.h"
30 30
diff --git a/libpixelflinger/codeflinger/GGLAssembler.cpp b/libpixelflinger/codeflinger/GGLAssembler.cpp
index 0b9b5a472..91fbd53cf 100644
--- a/libpixelflinger/codeflinger/GGLAssembler.cpp
+++ b/libpixelflinger/codeflinger/GGLAssembler.cpp
@@ -23,7 +23,7 @@
23#include <stdlib.h> 23#include <stdlib.h>
24#include <sys/types.h> 24#include <sys/types.h>
25 25
26#include <android/log.h> 26#include <log/log.h>
27 27
28#include "GGLAssembler.h" 28#include "GGLAssembler.h"
29 29
diff --git a/libpixelflinger/codeflinger/MIPS64Assembler.cpp b/libpixelflinger/codeflinger/MIPS64Assembler.cpp
index a7bbaf7b1..d5e4cea89 100644
--- a/libpixelflinger/codeflinger/MIPS64Assembler.cpp
+++ b/libpixelflinger/codeflinger/MIPS64Assembler.cpp
@@ -30,8 +30,8 @@
30#include <stdio.h> 30#include <stdio.h>
31#include <stdlib.h> 31#include <stdlib.h>
32 32
33#include <android/log.h>
34#include <cutils/properties.h> 33#include <cutils/properties.h>
34#include <log/log.h>
35#include <private/pixelflinger/ggl_context.h> 35#include <private/pixelflinger/ggl_context.h>
36 36
37#include "MIPS64Assembler.h" 37#include "MIPS64Assembler.h"
diff --git a/libpixelflinger/codeflinger/MIPSAssembler.cpp b/libpixelflinger/codeflinger/MIPSAssembler.cpp
index 4cddcc85b..865a5683c 100644
--- a/libpixelflinger/codeflinger/MIPSAssembler.cpp
+++ b/libpixelflinger/codeflinger/MIPSAssembler.cpp
@@ -47,14 +47,13 @@
47** functions in ARMAssemblerInterface.cpp so they could be used as static initializers). 47** functions in ARMAssemblerInterface.cpp so they could be used as static initializers).
48*/ 48*/
49 49
50
51#define LOG_TAG "MIPSAssembler" 50#define LOG_TAG "MIPSAssembler"
52 51
53#include <stdio.h> 52#include <stdio.h>
54#include <stdlib.h> 53#include <stdlib.h>
55 54
56#include <android/log.h>
57#include <cutils/properties.h> 55#include <cutils/properties.h>
56#include <log/log.h>
58#include <private/pixelflinger/ggl_context.h> 57#include <private/pixelflinger/ggl_context.h>
59 58
60#include "CodeCache.h" 59#include "CodeCache.h"
diff --git a/libpixelflinger/codeflinger/blending.cpp b/libpixelflinger/codeflinger/blending.cpp
index 092f14092..a55dfe3dd 100644
--- a/libpixelflinger/codeflinger/blending.cpp
+++ b/libpixelflinger/codeflinger/blending.cpp
@@ -23,7 +23,7 @@
23#include <stdlib.h> 23#include <stdlib.h>
24#include <sys/types.h> 24#include <sys/types.h>
25 25
26#include <android/log.h> 26#include <log/log.h>
27 27
28#include "GGLAssembler.h" 28#include "GGLAssembler.h"
29 29
diff --git a/libpixelflinger/codeflinger/load_store.cpp b/libpixelflinger/codeflinger/load_store.cpp
index b8a0e555d..da21e1d97 100644
--- a/libpixelflinger/codeflinger/load_store.cpp
+++ b/libpixelflinger/codeflinger/load_store.cpp
@@ -20,7 +20,7 @@
20#include <assert.h> 20#include <assert.h>
21#include <stdio.h> 21#include <stdio.h>
22 22
23#include <android/log.h> 23#include <log/log.h>
24 24
25#include "GGLAssembler.h" 25#include "GGLAssembler.h"
26 26
diff --git a/libpixelflinger/codeflinger/texturing.cpp b/libpixelflinger/codeflinger/texturing.cpp
index f4f465796..4c357af83 100644
--- a/libpixelflinger/codeflinger/texturing.cpp
+++ b/libpixelflinger/codeflinger/texturing.cpp
@@ -23,7 +23,7 @@
23#include <stdlib.h> 23#include <stdlib.h>
24#include <sys/types.h> 24#include <sys/types.h>
25 25
26#include <android/log.h> 26#include <log/log.h>
27 27
28#include "GGLAssembler.h" 28#include "GGLAssembler.h"
29 29
diff --git a/libpixelflinger/scanline.cpp b/libpixelflinger/scanline.cpp
index 1a2f6fb91..c6cf5bffe 100644
--- a/libpixelflinger/scanline.cpp
+++ b/libpixelflinger/scanline.cpp
@@ -22,8 +22,8 @@
22#include <stdlib.h> 22#include <stdlib.h>
23#include <string.h> 23#include <string.h>
24 24
25#include <android/log.h>
26#include <cutils/memory.h> 25#include <cutils/memory.h>
26#include <log/log.h>
27 27
28#include "buffer.h" 28#include "buffer.h"
29#include "scanline.h" 29#include "scanline.h"
diff --git a/libpixelflinger/trap.cpp b/libpixelflinger/trap.cpp
index fa6338aa4..234bfdde1 100644
--- a/libpixelflinger/trap.cpp
+++ b/libpixelflinger/trap.cpp
@@ -21,8 +21,8 @@
21#include <stdio.h> 21#include <stdio.h>
22#include <stdlib.h> 22#include <stdlib.h>
23 23
24#include <android/log.h>
25#include <cutils/memory.h> 24#include <cutils/memory.h>
25#include <log/log.h>
26 26
27#include "trap.h" 27#include "trap.h"
28#include "picker.h" 28#include "picker.h"
diff --git a/libsuspend/autosuspend.c b/libsuspend/autosuspend.c
index 64d1bfc74..54730c293 100644
--- a/libsuspend/autosuspend.c
+++ b/libsuspend/autosuspend.c
@@ -18,7 +18,7 @@
18 18
19#include <stdbool.h> 19#include <stdbool.h>
20 20
21#include <android/log.h> 21#include <log/log.h>
22 22
23#include <suspend/autosuspend.h> 23#include <suspend/autosuspend.h>
24 24
diff --git a/libsuspend/autosuspend_autosleep.c b/libsuspend/autosuspend_autosleep.c
index 97109ac2c..77d8db0a6 100644
--- a/libsuspend/autosuspend_autosleep.c
+++ b/libsuspend/autosuspend_autosleep.c
@@ -24,7 +24,7 @@
24#include <sys/types.h> 24#include <sys/types.h>
25#include <unistd.h> 25#include <unistd.h>
26 26
27#include <android/log.h> 27#include <log/log.h>
28 28
29#include "autosuspend_ops.h" 29#include "autosuspend_ops.h"
30 30
diff --git a/libsuspend/autosuspend_earlysuspend.c b/libsuspend/autosuspend_earlysuspend.c
index 9519e51ea..809ee825e 100644
--- a/libsuspend/autosuspend_earlysuspend.c
+++ b/libsuspend/autosuspend_earlysuspend.c
@@ -26,7 +26,7 @@
26#include <sys/types.h> 26#include <sys/types.h>
27#include <unistd.h> 27#include <unistd.h>
28 28
29#include <android/log.h> 29#include <log/log.h>
30 30
31#include "autosuspend_ops.h" 31#include "autosuspend_ops.h"
32 32
diff --git a/libsuspend/autosuspend_wakeup_count.c b/libsuspend/autosuspend_wakeup_count.c
index 3457d5baf..2da204ae0 100644
--- a/libsuspend/autosuspend_wakeup_count.c
+++ b/libsuspend/autosuspend_wakeup_count.c
@@ -29,7 +29,7 @@
29#include <sys/types.h> 29#include <sys/types.h>
30#include <unistd.h> 30#include <unistd.h>
31 31
32#include <android/log.h> 32#include <log/log.h>
33 33
34#include "autosuspend_ops.h" 34#include "autosuspend_ops.h"
35 35
diff --git a/libutils/Looper.cpp b/libutils/Looper.cpp
index 26e27cf79..77e69e4b3 100644
--- a/libutils/Looper.cpp
+++ b/libutils/Looper.cpp
@@ -21,7 +21,7 @@
21#include <sys/eventfd.h> 21#include <sys/eventfd.h>
22#include <unistd.h> 22#include <unistd.h>
23 23
24#include <android/log.h> 24#include <log/log.h>
25#include <utils/Looper.h> 25#include <utils/Looper.h>
26#include <utils/Timers.h> 26#include <utils/Timers.h>
27 27
diff --git a/libutils/SharedBuffer.cpp b/libutils/SharedBuffer.cpp
index 269326a6d..957aedb8f 100644
--- a/libutils/SharedBuffer.cpp
+++ b/libutils/SharedBuffer.cpp
@@ -19,7 +19,7 @@
19#include <stdlib.h> 19#include <stdlib.h>
20#include <string.h> 20#include <string.h>
21 21
22#include <android/log.h> 22#include <log/log.h>
23 23
24#include "SharedBuffer.h" 24#include "SharedBuffer.h"
25 25
diff --git a/libutils/Unicode.cpp b/libutils/Unicode.cpp
index c32f46246..f1a41b96f 100644
--- a/libutils/Unicode.cpp
+++ b/libutils/Unicode.cpp
@@ -19,7 +19,7 @@
19#include <limits.h> 19#include <limits.h>
20#include <stddef.h> 20#include <stddef.h>
21 21
22#include <android/log.h> 22#include <log/log.h>
23#include <utils/Unicode.h> 23#include <utils/Unicode.h>
24 24
25#if defined(_WIN32) 25#if defined(_WIN32)
diff --git a/libutils/VectorImpl.cpp b/libutils/VectorImpl.cpp
index 893e4f26f..f7ca8f4f9 100644
--- a/libutils/VectorImpl.cpp
+++ b/libutils/VectorImpl.cpp
@@ -20,7 +20,7 @@
20#include <stdlib.h> 20#include <stdlib.h>
21#include <string.h> 21#include <string.h>
22 22
23#include <android/log.h> 23#include <log/log.h>
24#include <utils/Errors.h> 24#include <utils/Errors.h>
25#include <utils/VectorImpl.h> 25#include <utils/VectorImpl.h>
26 26
diff --git a/libziparchive/zip_archive_stream_entry.cc b/libziparchive/zip_archive_stream_entry.cc
index 64b24c36e..3f336a6f2 100644
--- a/libziparchive/zip_archive_stream_entry.cc
+++ b/libziparchive/zip_archive_stream_entry.cc
@@ -26,8 +26,9 @@
26#include <memory> 26#include <memory>
27#include <vector> 27#include <vector>
28 28
29#include <android/log.h>
30#include <android-base/file.h> 29#include <android-base/file.h>
30#include <log/log.h>
31
31#include <ziparchive/zip_archive.h> 32#include <ziparchive/zip_archive.h>
32#include <ziparchive/zip_archive_stream_entry.h> 33#include <ziparchive/zip_archive_stream_entry.h>
33#include <zlib.h> 34#include <zlib.h>
diff --git a/lmkd/lmkd.c b/lmkd/lmkd.c
index 49746b36a..8a6168cd3 100644
--- a/lmkd/lmkd.c
+++ b/lmkd/lmkd.c
@@ -31,8 +31,8 @@
31#include <sys/types.h> 31#include <sys/types.h>
32#include <unistd.h> 32#include <unistd.h>
33 33
34#include <android/log.h>
35#include <cutils/sockets.h> 34#include <cutils/sockets.h>
35#include <log/log.h>
36#include <processgroup/processgroup.h> 36#include <processgroup/processgroup.h>
37 37
38#ifndef __unused 38#ifndef __unused
diff --git a/logwrapper/logwrap.c b/logwrapper/logwrap.c
index 1bfecd69a..3ad098347 100644
--- a/logwrapper/logwrap.c
+++ b/logwrapper/logwrap.c
@@ -28,8 +28,8 @@
28#include <sys/wait.h> 28#include <sys/wait.h>
29#include <unistd.h> 29#include <unistd.h>
30 30
31#include <android/log.h>
32#include <cutils/klog.h> 31#include <cutils/klog.h>
32#include <log/log.h>
33#include <logwrap/logwrap.h> 33#include <logwrap/logwrap.h>
34#include <private/android_filesystem_config.h> 34#include <private/android_filesystem_config.h>
35 35
diff --git a/logwrapper/logwrapper.c b/logwrapper/logwrapper.c
index 28fe530e1..33454c6a6 100644
--- a/logwrapper/logwrapper.c
+++ b/logwrapper/logwrapper.c
@@ -20,8 +20,8 @@
20#include <sys/wait.h> 20#include <sys/wait.h>
21#include <unistd.h> 21#include <unistd.h>
22 22
23#include <android/log.h>
24#include <cutils/klog.h> 23#include <cutils/klog.h>
24#include <log/log.h>
25#include <logwrap/logwrap.h> 25#include <logwrap/logwrap.h>
26 26
27void fatal(const char *msg) { 27void fatal(const char *msg) {
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 @@
19#include <assert.h> 19#include <assert.h>
20#include <errno.h> 20#include <errno.h>
21#include <stdio.h> 21#include <stdio.h>
22
22#include <type_traits> 23#include <type_traits>
23 24
24#include <android/log.h> 25#include <log/log.h>
25 26
26#include "trusty_gatekeeper.h" 27#include "trusty_gatekeeper.h"
27#include "trusty_gatekeeper_ipc.h" 28#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 @@
22#include <string.h> 22#include <string.h>
23#include <unistd.h> 23#include <unistd.h>
24 24
25#include <android/log.h> 25#include <log/log.h>
26#include <trusty/tipc.h> 26#include <trusty/tipc.h>
27 27
28#include "trusty_gatekeeper_ipc.h" 28#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 @@
27 27
28#include <type_traits> 28#include <type_traits>
29 29
30#include <android/log.h>
31#include <hardware/keymaster0.h> 30#include <hardware/keymaster0.h>
32#include <keymaster/authorization_set.h> 31#include <keymaster/authorization_set.h>
32#include <log/log.h>
33 33
34#include "trusty_keymaster_device.h" 34#include "trusty_keymaster_device.h"
35#include "trusty_keymaster_ipc.h" 35#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 @@
23#include <string.h> 23#include <string.h>
24#include <unistd.h> 24#include <unistd.h>
25 25
26#include <android/log.h> 26#include <log/log.h>
27#include <trusty/tipc.h> 27#include <trusty/tipc.h>
28 28
29#include "trusty_keymaster_ipc.h" 29#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 @@
25#include <sys/ioctl.h> 25#include <sys/ioctl.h>
26#include <unistd.h> 26#include <unistd.h>
27 27
28#include <android/log.h> 28#include <log/log.h>
29 29
30#include "tipc_ioctl.h" 30#include "tipc_ioctl.h"
31 31
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 @@
22#include <string.h> 22#include <string.h>
23#include <unistd.h> 23#include <unistd.h>
24 24
25#include <android/log.h>
26#include <hardware/nvram.h> 25#include <hardware/nvram.h>
26#include <log/log.h>
27#include <trusty/tipc.h> 27#include <trusty/tipc.h>
28 28
29#include <nvram/messages/blob.h> 29#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 @@
23#include <string.h> 23#include <string.h>
24#include <sys/uio.h> 24#include <sys/uio.h>
25 25
26#include <android/log.h> 26#include <log/log.h>
27#include <trusty/tipc.h> 27#include <trusty/tipc.h>
28#include <trusty/lib/storage.h> 28#include <trusty/lib/storage.h>
29 29