diff options
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 @@ #include <pthread.h> #include <sys/resource.h> -#include <android/log.h> +#include <log/log.h> #include <utils/Vector.h> #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 @@ #include <string.h> #include <sys/ptrace.h> -#include <android/log.h> #include <backtrace/Backtrace.h> +#include <log/log.h> #include "machine.h" #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 @@ #include <sys/ptrace.h> #include <sys/uio.h> -#include <android/log.h> #include <backtrace/Backtrace.h> +#include <log/log.h> #include "machine.h" #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 @@ #include <memory> #include <string> -#include <android/log.h> #include <backtrace/Backtrace.h> +#include <log/log.h> #include "backtrace.h" 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 @@ #include <selinux/android.h> -#include <android/log.h> #include <android-base/file.h> #include <android-base/unique_fd.h> #include <cutils/debugger.h> #include <cutils/properties.h> #include <cutils/sockets.h> +#include <log/log.h> #include <private/android_filesystem_config.h> 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 @@ #include <string> -#include <android/log.h> #include <android-base/stringprintf.h> #include <backtrace/Backtrace.h> +#include <log/log.h> #include "elf_utils.h" 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 @@ #include <string.h> #include <sys/ptrace.h> -#include <android/log.h> #include <backtrace/Backtrace.h> +#include <log/log.h> #include "machine.h" #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 @@ #include <string.h> #include <sys/ptrace.h> -#include <android/log.h> #include <backtrace/Backtrace.h> +#include <log/log.h> #include "machine.h" #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 @@ #include <vector> #include <android-base/file.h> -#include <android/log.h> +#include <log/log.h> #include "open_files_list.h" 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 @@ #include <sys/wait.h> #include <unistd.h> -#include <android/log.h> +#include <log/log.h> #include "signal_sender.h" 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 @@ #include <string.h> #include <sys/ptrace.h> -#include <android/log.h> #include <backtrace/Backtrace.h> +#include <log/log.h> #include "machine.h" #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 @@ #include <errno.h> #include <stdint.h> -#include <sys/ptrace.h> #include <string.h> +#include <sys/ptrace.h> #include <sys/user.h> -#include <android/log.h> #include <backtrace/Backtrace.h> +#include <log/log.h> #include "machine.h" #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 @@ #define LOG_TAG "fingerprintd" -#include <android/log.h> #include <binder/IPCThreadState.h> #include <binder/IServiceManager.h> #include <binder/PermissionCache.h> @@ -25,6 +24,7 @@ #include <hardware/hw_auth_token.h> #include <keystore/IKeystoreService.h> #include <keystore/keystore.h> // for error codes +#include <log/log.h> #include <utils/Log.h> #include <utils/String16.h> 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 @@ #include <stdint.h> #include <unistd.h> -#include <android/log.h> #include <binder/IPCThreadState.h> #include <binder/IServiceManager.h> #include <binder/PermissionCache.h> @@ -33,6 +32,7 @@ #include <hardware/hw_auth_token.h> #include <keystore/IKeystoreService.h> #include <keystore/keystore.h> // For error code +#include <log/log.h> #include <utils/Log.h> #include <utils/String16.h> 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 @@ #define LOG_TAG "libbacktrace" -#include <android/log.h> +#include <log/log.h> // Macro to log the function name along with the warning message. #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 @@ #include <sys/types.h> #include <unistd.h> -#include <android/log.h> +#include <log/log.h> + #include <backtrace/backtrace_constants.h> #include <backtrace/BacktraceMap.h> 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 @@ #include <sys/types.h> #include <unistd.h> -#include <android/log.h> #include <cutils/ashmem.h> +#include <log/log.h> #define ASHMEM_DEVICE "/dev/ashmem" 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 @@ #include <sys/types.h> #include <unistd.h> -#include <android/log.h> #include <cutils/debugger.h> #include <cutils/sockets.h> +#include <log/log.h> static int send_request(int sock_fd, void* msg_ptr, size_t msg_len) { 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 @@ #define LOG_TAG "dlmalloc-stubs" -#include "android/log.h" +#include "log/log.h" #define UNUSED __attribute__((__unused__)) 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 @@ #include <sys/types.h> #include <unistd.h> -#include <android/log.h> #include <cutils/fs.h> +#include <log/log.h> #define ALL_PERMS (S_ISUID | S_ISGID | S_ISVTX | S_IRWXU | S_IRWXG | S_IRWXO) #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 @@ #include <sys/stat.h> #include <sys/types.h> -#include <android/log.h> +#include <log/log.h> #include <private/android_filesystem_config.h> #include <utils/Compat.h> 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 @@ #include <string.h> #include <unistd.h> -#include <android/log.h> #include <cutils/properties.h> #include <cutils/sockets.h> +#include <log/log.h> int8_t property_get_bool(const char *key, int8_t default_value) { 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 @@ #include <string.h> #include <unistd.h> -#include <android/log.h> +#include <log/log.h> #include <cutils/qtaguid.h> static 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 @@ #include <time.h> #include <unistd.h> -#include <android/log.h> #include <cutils/android_get_control_file.h> #include <cutils/sockets.h> +#include <log/log.h> #include "android_get_control_env.h" 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 @@ #include <stdlib.h> #include <string.h> -#include <android/log.h> #include <cutils/hashmap.h> #include <cutils/memory.h> #include <cutils/str_parms.h> +#include <log/log.h> #define UNUSED __attribute__((unused)) 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 @@ #include <stdlib.h> #include <string.h> -#include <android/log.h> #include <diskconfig/diskconfig.h> +#include <log/log.h> /* start and len are in LBA units */ static 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 @@ #include <sys/stat.h> #include <unistd.h> -#include <android/log.h> #include <cutils/config_utils.h> +#include <log/log.h> #include <diskconfig/diskconfig.h> 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 @@ #include <sys/stat.h> #include <unistd.h> -#include <android/log.h> +#include <log/log.h> #include <diskconfig/diskconfig.h> 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 @@ #include <stdio.h> -#include <android/log.h> +#include <log/log.h> #include "diskconfig.h" 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 @@ #include <sys/types.h> #include <unistd.h> -#include <android/log.h> #include <diskconfig/diskconfig.h> +#include <log/log.h> struct write_list * alloc_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 @@ #include <sys/types.h> #include <unistd.h> -#include <android/log.h> #include <ion/ion.h> +#include <log/log.h> int ion_open() { 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 @@ #include <malloc.h> #include <string.h> -#include <android/log.h> #include <hardware/memtrack.h> +#include <log/log.h> #define ARRAY_SIZE(x) (sizeof(x)/sizeof((x)[0])) 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 @@ #define LOG_TAG "libmemunreachable" -#include <android/log.h> +#include <log/log.h> #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 @@ #include <cstring> -#include <android/log.h> +#include <log/log.h> namespace android { 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 @@ #include <dlfcn.h> #ifdef __ANDROID__ -#include "dlext_namespaces.h" #define LOG_TAG "libnativeloader" -#include "android/log.h" +#include "dlext_namespaces.h" #include "cutils/properties.h" +#include "log/log.h" #endif #include "nativebridge/native_bridge.h" 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 @@ #include <time.h> #include <unistd.h> -#include <android/log.h> #include <cutils/properties.h> +#include <log/log.h> #include <netutils/ifc.h> #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 @@ #ifdef ANDROID #define LOG_TAG "NetUtils" -#include <android/log.h> #include <cutils/properties.h> +#include <log/log.h> #else #define ALOGD printf #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 @@ #ifdef ANDROID #define LOG_TAG "DHCP" -#include <android/log.h> +#include <log/log.h> #else #include <stdio.h> #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 @@ #include <string.h> #include <sys/limits.h> -#include <android/log.h> +#include <log/log.h> #include <packagelistparser/packagelistparser.h> #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 @@ #include <stdio.h> #include <stdlib.h> -#include <android/log.h> #include <cutils/properties.h> +#include <log/log.h> #include <private/pixelflinger/ggl_context.h> #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 @@ #include <stdlib.h> #include <sys/types.h> -#include <android/log.h> +#include <log/log.h> #include "ARMAssemblerInterface.h" 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 @@ #include <stdlib.h> #include <string.h> -#include <android/log.h> #include <cutils/properties.h> +#include <log/log.h> #include <private/pixelflinger/ggl_context.h> #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 @@ #include <sys/mman.h> #include <unistd.h> -#include <android/log.h> #include <cutils/ashmem.h> +#include <log/log.h> #include "CodeCache.h" 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 @@ #include <stdlib.h> #include <sys/types.h> -#include <android/log.h> +#include <log/log.h> #include "GGLAssembler.h" 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 @@ #include <stdio.h> #include <stdlib.h> -#include <android/log.h> #include <cutils/properties.h> +#include <log/log.h> #include <private/pixelflinger/ggl_context.h> #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 @@ ** functions in ARMAssemblerInterface.cpp so they could be used as static initializers). */ - #define LOG_TAG "MIPSAssembler" #include <stdio.h> #include <stdlib.h> -#include <android/log.h> #include <cutils/properties.h> +#include <log/log.h> #include <private/pixelflinger/ggl_context.h> #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 @@ #include <stdlib.h> #include <sys/types.h> -#include <android/log.h> +#include <log/log.h> #include "GGLAssembler.h" 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 @@ #include <assert.h> #include <stdio.h> -#include <android/log.h> +#include <log/log.h> #include "GGLAssembler.h" 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 @@ #include <stdlib.h> #include <sys/types.h> -#include <android/log.h> +#include <log/log.h> #include "GGLAssembler.h" 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 @@ #include <stdlib.h> #include <string.h> -#include <android/log.h> #include <cutils/memory.h> +#include <log/log.h> #include "buffer.h" #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 @@ #include <stdio.h> #include <stdlib.h> -#include <android/log.h> #include <cutils/memory.h> +#include <log/log.h> #include "trap.h" #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 @@ #include <stdbool.h> -#include <android/log.h> +#include <log/log.h> #include <suspend/autosuspend.h> 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 @@ #include <sys/types.h> #include <unistd.h> -#include <android/log.h> +#include <log/log.h> #include "autosuspend_ops.h" 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 @@ #include <sys/types.h> #include <unistd.h> -#include <android/log.h> +#include <log/log.h> #include "autosuspend_ops.h" 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 @@ #include <sys/types.h> #include <unistd.h> -#include <android/log.h> +#include <log/log.h> #include "autosuspend_ops.h" 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 @@ #include <sys/eventfd.h> #include <unistd.h> -#include <android/log.h> +#include <log/log.h> #include <utils/Looper.h> #include <utils/Timers.h> 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 @@ #include <stdlib.h> #include <string.h> -#include <android/log.h> +#include <log/log.h> #include "SharedBuffer.h" 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 @@ #include <limits.h> #include <stddef.h> -#include <android/log.h> +#include <log/log.h> #include <utils/Unicode.h> #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 @@ #include <stdlib.h> #include <string.h> -#include <android/log.h> +#include <log/log.h> #include <utils/Errors.h> #include <utils/VectorImpl.h> 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 @@ #include <memory> #include <vector> -#include <android/log.h> #include <android-base/file.h> +#include <log/log.h> + #include <ziparchive/zip_archive.h> #include <ziparchive/zip_archive_stream_entry.h> #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 @@ #include <sys/types.h> #include <unistd.h> -#include <android/log.h> #include <cutils/sockets.h> +#include <log/log.h> #include <processgroup/processgroup.h> #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 @@ #include <sys/wait.h> #include <unistd.h> -#include <android/log.h> #include <cutils/klog.h> +#include <log/log.h> #include <logwrap/logwrap.h> #include <private/android_filesystem_config.h> 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 @@ #include <sys/wait.h> #include <unistd.h> -#include <android/log.h> #include <cutils/klog.h> +#include <log/log.h> #include <logwrap/logwrap.h> void 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 @@ #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> |