diff options
46 files changed, 69 insertions, 58 deletions
diff --git a/cmds/installd/InstalldNativeService.cpp b/cmds/installd/InstalldNativeService.cpp index ee4d5419db..a6937378a5 100644 --- a/cmds/installd/InstalldNativeService.cpp +++ b/cmds/installd/InstalldNativeService.cpp @@ -39,9 +39,9 @@ #include <android-base/strings.h> #include <android-base/unique_fd.h> #include <cutils/fs.h> -#include <cutils/log.h> // TODO: Move everything to base/logging. #include <cutils/properties.h> #include <cutils/sched_policy.h> +#include <log/log.h> // TODO: Move everything to base/logging. #include <logwrap/logwrap.h> #include <private/android_filesystem_config.h> #include <selinux/android.h> diff --git a/cmds/installd/dexopt.cpp b/cmds/installd/dexopt.cpp index 868e494a92..76d5695ca0 100644 --- a/cmds/installd/dexopt.cpp +++ b/cmds/installd/dexopt.cpp @@ -27,13 +27,13 @@ #include <sys/wait.h> #include <unistd.h> -#include <android/log.h> // TODO: Move everything to base/logging. #include <android-base/logging.h> #include <android-base/stringprintf.h> #include <android-base/strings.h> #include <android-base/unique_fd.h> #include <cutils/properties.h> #include <cutils/sched_policy.h> +#include <log/log.h> // TODO: Move everything to base/logging. #include <private/android_filesystem_config.h> #include <system/thread_defs.h> diff --git a/cmds/installd/globals.cpp b/cmds/installd/globals.cpp index c0ea79cd0b..edcdb6a1e2 100644 --- a/cmds/installd/globals.cpp +++ b/cmds/installd/globals.cpp @@ -19,7 +19,7 @@ #include <stdlib.h> #include <string.h> -#include <android/log.h> // TODO: Move everything to base::logging. +#include <log/log.h> // TODO: Move everything to base::logging. #include <globals.h> #include <installd_constants.h> diff --git a/cmds/installd/otapreopt.cpp b/cmds/installd/otapreopt.cpp index 7aba5d049d..c74c65b859 100644 --- a/cmds/installd/otapreopt.cpp +++ b/cmds/installd/otapreopt.cpp @@ -27,13 +27,13 @@ #include <sys/stat.h> #include <sys/wait.h> -#include <android/log.h> #include <android-base/logging.h> #include <android-base/macros.h> #include <android-base/stringprintf.h> #include <android-base/strings.h> #include <cutils/fs.h> #include <cutils/properties.h> +#include <log/log.h> #include <private/android_filesystem_config.h> #include "InstalldNativeService.h" diff --git a/cmds/installd/utils.cpp b/cmds/installd/utils.cpp index 9849a0f89f..0b1cd7e99d 100644 --- a/cmds/installd/utils.cpp +++ b/cmds/installd/utils.cpp @@ -30,10 +30,10 @@ #include <sys/statfs.h> #endif -#include <android/log.h> #include <android-base/logging.h> #include <android-base/stringprintf.h> #include <cutils/fs.h> +#include <log/log.h> #include <private/android_filesystem_config.h> #include "globals.h" // extern variables. diff --git a/cmds/ip-up-vpn/ip-up-vpn.c b/cmds/ip-up-vpn/ip-up-vpn.c index 5c566fcb57..3b8955b166 100644 --- a/cmds/ip-up-vpn/ip-up-vpn.c +++ b/cmds/ip-up-vpn/ip-up-vpn.c @@ -29,7 +29,7 @@ #include <sys/stat.h> #include <sys/types.h> -#include <android/log.h> +#include <log/log.h> #define DIR "/data/misc/vpn/" diff --git a/cmds/servicemanager/binder.c b/cmds/servicemanager/binder.c index cb557aa62e..753aeb5020 100644 --- a/cmds/servicemanager/binder.c +++ b/cmds/servicemanager/binder.c @@ -12,7 +12,7 @@ #include <sys/mman.h> #include <unistd.h> -#include <android/log.h> +#include <log/log.h> #include "binder.h" diff --git a/cmds/servicemanager/service_manager.c b/cmds/servicemanager/service_manager.c index 8f4e01be10..a31e3c73d0 100644 --- a/cmds/servicemanager/service_manager.c +++ b/cmds/servicemanager/service_manager.c @@ -22,7 +22,7 @@ #define ALOGE(x...) fprintf(stderr, "svcmgr: " x) #else #define LOG_TAG "ServiceManager" -#include <android/log.h> +#include <log/log.h> #endif struct audit_data { diff --git a/include/ui/Rect.h b/include/ui/Rect.h index 8aadd58bed..ce33d4e031 100644 --- a/include/ui/Rect.h +++ b/include/ui/Rect.h @@ -21,9 +21,10 @@ #include <utils/Flattenable.h> #include <utils/Log.h> #include <utils/TypeHelpers.h> +#include <log/log.h> + #include <ui/Point.h> -#include <android/log.h> #include <android/rect.h> namespace android { diff --git a/libs/binder/IMemory.cpp b/libs/binder/IMemory.cpp index 45633f3e07..f4e0a60444 100644 --- a/libs/binder/IMemory.cpp +++ b/libs/binder/IMemory.cpp @@ -25,9 +25,9 @@ #include <sys/mman.h> #include <unistd.h> -#include <android/log.h> #include <binder/IMemory.h> #include <binder/Parcel.h> +#include <log/log.h> #include <utils/CallStack.h> #include <utils/KeyedVector.h> #include <utils/threads.h> diff --git a/libs/binder/MemoryHeapBase.cpp b/libs/binder/MemoryHeapBase.cpp index 415c252182..9bb770226d 100644 --- a/libs/binder/MemoryHeapBase.cpp +++ b/libs/binder/MemoryHeapBase.cpp @@ -25,12 +25,11 @@ #include <sys/types.h> #include <unistd.h> -#include <android/log.h> +#include <binder/MemoryHeapBase.h> +#include <log/log.h> #include <cutils/ashmem.h> #include <cutils/atomic.h> -#include <binder/MemoryHeapBase.h> - namespace android { // --------------------------------------------------------------------------- diff --git a/libs/binder/PersistableBundle.cpp b/libs/binder/PersistableBundle.cpp index 70d425e8d3..e7078baa82 100644 --- a/libs/binder/PersistableBundle.cpp +++ b/libs/binder/PersistableBundle.cpp @@ -20,9 +20,9 @@ #include <limits> -#include <android/log.h> #include <binder/IBinder.h> #include <binder/Parcel.h> +#include <log/log.h> #include <utils/Errors.h> using android::BAD_TYPE; diff --git a/libs/gui/GraphicBufferAlloc.cpp b/libs/gui/GraphicBufferAlloc.cpp index 7d91d33746..30f5e53520 100644 --- a/libs/gui/GraphicBufferAlloc.cpp +++ b/libs/gui/GraphicBufferAlloc.cpp @@ -15,7 +15,7 @@ ** limitations under the License. */ -#include <android/log.h> +#include <log/log.h> #include <ui/GraphicBuffer.h> diff --git a/libs/gui/Sensor.cpp b/libs/gui/Sensor.cpp index dbf03a5232..7510429645 100644 --- a/libs/gui/Sensor.cpp +++ b/libs/gui/Sensor.cpp @@ -19,11 +19,11 @@ #include <sys/limits.h> #include <sys/types.h> -#include <android/log.h> #include <binder/AppOpsManager.h> #include <binder/IServiceManager.h> #include <gui/Sensor.h> #include <hardware/sensors.h> +#include <log/log.h> #include <utils/Errors.h> #include <utils/String8.h> #include <utils/Flattenable.h> diff --git a/libs/input/InputTransport.cpp b/libs/input/InputTransport.cpp index 136dd7fcdf..af1c0af815 100644 --- a/libs/input/InputTransport.cpp +++ b/libs/input/InputTransport.cpp @@ -27,8 +27,9 @@ #include <sys/types.h> #include <unistd.h> -#include <android/log.h> #include <cutils/properties.h> +#include <log/log.h> + #include <input/InputTransport.h> namespace android { diff --git a/libs/ui/GraphicBufferAllocator.cpp b/libs/ui/GraphicBufferAllocator.cpp index 6f57d37043..5ae4faa919 100644 --- a/libs/ui/GraphicBufferAllocator.cpp +++ b/libs/ui/GraphicBufferAllocator.cpp @@ -18,8 +18,7 @@ #define LOG_TAG "GraphicBufferAllocator" #define ATRACE_TAG ATRACE_TAG_GRAPHICS -#include <android/log.h> - +#include <log/log.h> #include <utils/Singleton.h> #include <utils/String8.h> #include <utils/Trace.h> diff --git a/opengl/libagl/egl.cpp b/opengl/libagl/egl.cpp index 4e9cb5b6d2..493c0b8ec9 100644 --- a/opengl/libagl/egl.cpp +++ b/opengl/libagl/egl.cpp @@ -27,7 +27,7 @@ #include <sys/mman.h> #include <unistd.h> -#include <android/log.h> +#include <log/log.h> #include <utils/threads.h> #include <ui/ANativeObjectBase.h> diff --git a/opengl/libs/EGL/Loader.cpp b/opengl/libs/EGL/Loader.cpp index 27d81fed2c..ac455cdd70 100644 --- a/opengl/libs/EGL/Loader.cpp +++ b/opengl/libs/EGL/Loader.cpp @@ -23,8 +23,8 @@ #include <stdlib.h> #include <string.h> -#include <android/log.h> #include <cutils/properties.h> +#include <log/log.h> #include <EGL/egl.h> diff --git a/opengl/libs/EGL/egl.cpp b/opengl/libs/EGL/egl.cpp index 4245a92a3c..ee83ada26d 100644 --- a/opengl/libs/EGL/egl.cpp +++ b/opengl/libs/EGL/egl.cpp @@ -24,10 +24,9 @@ #include <EGL/egl.h> #include <EGL/eglext.h> -#include <android/log.h> #include <cutils/atomic.h> #include <cutils/properties.h> - +#include <log/log.h> #include <utils/CallStack.h> #include <utils/String8.h> diff --git a/opengl/libs/EGL/eglApi.cpp b/opengl/libs/EGL/eglApi.cpp index 3af7e935e3..c4541a23bd 100644 --- a/opengl/libs/EGL/eglApi.cpp +++ b/opengl/libs/EGL/eglApi.cpp @@ -27,11 +27,11 @@ #include <EGL/egl.h> #include <EGL/eglext.h> -#include <android/log.h> #include <cutils/atomic.h> #include <cutils/compiler.h> #include <cutils/memory.h> #include <cutils/properties.h> +#include <log/log.h> #include <gui/ISurfaceComposer.h> diff --git a/opengl/libs/EGL/egl_tls.cpp b/opengl/libs/EGL/egl_tls.cpp index 125700405f..6de5f27f4f 100644 --- a/opengl/libs/EGL/egl_tls.cpp +++ b/opengl/libs/EGL/egl_tls.cpp @@ -17,9 +17,8 @@ #include <pthread.h> #include <stdlib.h> -#include <android/log.h> #include <cutils/properties.h> - +#include <log/log.h> #include <utils/CallStack.h> #include <EGL/egl.h> diff --git a/services/inputflinger/InputDispatcher.cpp b/services/inputflinger/InputDispatcher.cpp index 793d59a0c0..89475e9be6 100644 --- a/services/inputflinger/InputDispatcher.cpp +++ b/services/inputflinger/InputDispatcher.cpp @@ -51,7 +51,7 @@ #include <time.h> #include <unistd.h> -#include <android/log.h> +#include <log/log.h> #include <utils/Trace.h> #include <powermanager/PowerManager.h> #include <ui/Region.h> diff --git a/services/inputflinger/InputManager.cpp b/services/inputflinger/InputManager.cpp index 6fe4d36af4..519faa6b5c 100644 --- a/services/inputflinger/InputManager.cpp +++ b/services/inputflinger/InputManager.cpp @@ -20,7 +20,7 @@ #include "InputManager.h" -#include <android/log.h> +#include <log/log.h> namespace android { diff --git a/services/inputflinger/InputReader.cpp b/services/inputflinger/InputReader.cpp index fbc7b12b92..c1e6365121 100644 --- a/services/inputflinger/InputReader.cpp +++ b/services/inputflinger/InputReader.cpp @@ -52,7 +52,7 @@ #include <stdlib.h> #include <unistd.h> -#include <android/log.h> +#include <log/log.h> #include <input/Keyboard.h> #include <input/VirtualKeyMap.h> diff --git a/services/inputflinger/InputWindow.cpp b/services/inputflinger/InputWindow.cpp index 297b0680e8..5e82d75c94 100644 --- a/services/inputflinger/InputWindow.cpp +++ b/services/inputflinger/InputWindow.cpp @@ -19,7 +19,7 @@ #include "InputWindow.h" -#include <android/log.h> +#include <log/log.h> #include <ui/Rect.h> #include <ui/Region.h> diff --git a/services/inputflinger/host/InputFlinger.cpp b/services/inputflinger/host/InputFlinger.cpp index 8edea3f7f6..f1d3726da2 100644 --- a/services/inputflinger/host/InputFlinger.cpp +++ b/services/inputflinger/host/InputFlinger.cpp @@ -20,10 +20,10 @@ #include <sys/types.h> #include <unistd.h> -#include <android/log.h> #include <binder/IPCThreadState.h> #include <binder/PermissionCache.h> #include <hardware/input.h> +#include <log/log.h> #include <private/android_filesystem_config.h> #include "InputFlinger.h" diff --git a/services/surfaceflinger/DdmConnection.cpp b/services/surfaceflinger/DdmConnection.cpp index ba09b36e1d..35d55f502a 100644 --- a/services/surfaceflinger/DdmConnection.cpp +++ b/services/surfaceflinger/DdmConnection.cpp @@ -18,7 +18,7 @@ #include <sys/types.h> #include <unistd.h> -#include <android/log.h> +#include <log/log.h> #include "jni.h" #include "DdmConnection.h" diff --git a/services/surfaceflinger/DispSync.cpp b/services/surfaceflinger/DispSync.cpp index 3229b6644c..86cf17d61a 100644 --- a/services/surfaceflinger/DispSync.cpp +++ b/services/surfaceflinger/DispSync.cpp @@ -24,7 +24,7 @@ #include <algorithm> -#include <android/log.h> +#include <log/log.h> #include <utils/String8.h> #include <utils/Thread.h> #include <utils/Trace.h> diff --git a/services/surfaceflinger/DisplayHardware/FramebufferSurface.cpp b/services/surfaceflinger/DisplayHardware/FramebufferSurface.cpp index 96dd55fecf..1998edfe7c 100644 --- a/services/surfaceflinger/DisplayHardware/FramebufferSurface.cpp +++ b/services/surfaceflinger/DisplayHardware/FramebufferSurface.cpp @@ -24,8 +24,8 @@ #include <stdlib.h> #include <string.h> -#include <android/log.h> #include <utils/String8.h> +#include <log/log.h> #include <ui/Rect.h> diff --git a/services/surfaceflinger/DisplayHardware/HWC2On1Adapter.cpp b/services/surfaceflinger/DisplayHardware/HWC2On1Adapter.cpp index 51e92b2360..7322c134ce 100644 --- a/services/surfaceflinger/DisplayHardware/HWC2On1Adapter.cpp +++ b/services/surfaceflinger/DisplayHardware/HWC2On1Adapter.cpp @@ -28,8 +28,8 @@ #include <cstdlib> #include <sstream> -#include <android/log.h> #include <hardware/hwcomposer.h> +#include <log/log.h> #include <utils/Trace.h> using namespace std::chrono_literals; diff --git a/services/surfaceflinger/DisplayHardware/HWComposer.cpp b/services/surfaceflinger/DisplayHardware/HWComposer.cpp index 3f38c8623e..7914770a85 100644 --- a/services/surfaceflinger/DisplayHardware/HWComposer.cpp +++ b/services/surfaceflinger/DisplayHardware/HWComposer.cpp @@ -43,8 +43,8 @@ #include <android/configuration.h> -#include <android/log.h> #include <cutils/properties.h> +#include <log/log.h> #include "HWComposer.h" #include "HWC2On1Adapter.h" diff --git a/services/surfaceflinger/DisplayHardware/HWComposer_hwc1.cpp b/services/surfaceflinger/DisplayHardware/HWComposer_hwc1.cpp index af280a4e32..cc5578df17 100644 --- a/services/surfaceflinger/DisplayHardware/HWComposer_hwc1.cpp +++ b/services/surfaceflinger/DisplayHardware/HWComposer_hwc1.cpp @@ -39,8 +39,8 @@ #include <android/configuration.h> -#include <android/log.h> #include <cutils/properties.h> +#include <log/log.h> #include <system/graphics.h> diff --git a/services/surfaceflinger/RenderEngine/Program.cpp b/services/surfaceflinger/RenderEngine/Program.cpp index 38a0039fe8..48a8da5e8e 100644 --- a/services/surfaceflinger/RenderEngine/Program.cpp +++ b/services/surfaceflinger/RenderEngine/Program.cpp @@ -16,7 +16,7 @@ #include <stdint.h> -#include <android/log.h> +#include <log/log.h> #include <utils/String8.h> #include "Program.h" diff --git a/services/surfaceflinger/RenderEngine/RenderEngine.cpp b/services/surfaceflinger/RenderEngine/RenderEngine.cpp index 986c6dfafb..9909bf99e0 100644 --- a/services/surfaceflinger/RenderEngine/RenderEngine.cpp +++ b/services/surfaceflinger/RenderEngine/RenderEngine.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include <android/log.h> +#include <log/log.h> #include <ui/Rect.h> #include <ui/Region.h> diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp index 193b702dec..db6b366786 100644 --- a/services/surfaceflinger/SurfaceFlinger.cpp +++ b/services/surfaceflinger/SurfaceFlinger.cpp @@ -28,8 +28,8 @@ #include <EGL/egl.h> -#include <android/log.h> #include <cutils/properties.h> +#include <log/log.h> #include <binder/IPCThreadState.h> #include <binder/IServiceManager.h> diff --git a/services/surfaceflinger/SurfaceFlinger_hwc1.cpp b/services/surfaceflinger/SurfaceFlinger_hwc1.cpp index 5c4245055a..0d05e9e0f4 100644 --- a/services/surfaceflinger/SurfaceFlinger_hwc1.cpp +++ b/services/surfaceflinger/SurfaceFlinger_hwc1.cpp @@ -16,19 +16,20 @@ #define ATRACE_TAG ATRACE_TAG_GRAPHICS -#include <stdint.h> -#include <sys/types.h> -#include <errno.h> -#include <math.h> -#include <mutex> #include <dlfcn.h> +#include <errno.h> #include <inttypes.h> +#include <math.h> #include <stdatomic.h> +#include <stdint.h> +#include <sys/types.h> + +#include <mutex> #include <EGL/egl.h> -#include <android/log.h> #include <cutils/properties.h> +#include <log/log.h> #include <binder/IPCThreadState.h> #include <binder/IServiceManager.h> diff --git a/vulkan/libvulkan/api.cpp b/vulkan/libvulkan/api.cpp index f5daca7020..e05ca5a83a 100644 --- a/vulkan/libvulkan/api.cpp +++ b/vulkan/libvulkan/api.cpp @@ -23,13 +23,14 @@ #include <stdlib.h> #include <string.h> + #include <algorithm> #include <mutex> #include <new> #include <utility> -#include <android/log.h> #include <cutils/properties.h> +#include <log/log.h> #include <vulkan/vk_layer_interface.h> #include "api.h" diff --git a/vulkan/libvulkan/api_gen.cpp b/vulkan/libvulkan/api_gen.cpp index b4e256a8e8..a33b1b7064 100644 --- a/vulkan/libvulkan/api_gen.cpp +++ b/vulkan/libvulkan/api_gen.cpp @@ -17,8 +17,10 @@ // WARNING: This file is generated. See ../README.md for instructions. #include <string.h> + #include <algorithm> -#include <android/log.h> + +#include <log/log.h> // to catch mismatches between vulkan.h and this file #undef VK_NO_PROTOTYPES diff --git a/vulkan/libvulkan/code-generator.tmpl b/vulkan/libvulkan/code-generator.tmpl index 2c70d465cc..dd64d451eb 100644 --- a/vulkan/libvulkan/code-generator.tmpl +++ b/vulkan/libvulkan/code-generator.tmpl @@ -91,8 +91,10 @@ bool InitDispatchTable( // WARNING: This file is generated. See ../README.md for instructions. ¶ #include <string.h> +¶ #include <algorithm> -#include <android/log.h> +¶ +#include <log/log.h> ¶ // to catch mismatches between vulkan.h and this file #undef VK_NO_PROTOTYPES @@ -270,8 +272,10 @@ bool InitDriverTable(VkDevice dev, PFN_vkGetDeviceProcAddr get_proc, // WARNING: This file is generated. See ../README.md for instructions. ¶ #include <string.h> +¶ #include <algorithm> -#include <android/log.h> +¶ +#include <log/log.h> ¶ #include "driver.h" ¶ diff --git a/vulkan/libvulkan/driver.cpp b/vulkan/libvulkan/driver.cpp index 8b9b9d2aa1..800e474e8a 100644 --- a/vulkan/libvulkan/driver.cpp +++ b/vulkan/libvulkan/driver.cpp @@ -14,13 +14,16 @@ * limitations under the License. */ +#include <malloc.h> #include <stdlib.h> #include <string.h> +#include <sys/prctl.h> + #include <algorithm> #include <array> #include <new> -#include <malloc.h> -#include <sys/prctl.h> + +#include <log/log.h> #include "driver.h" #include "stubhal.h" diff --git a/vulkan/libvulkan/driver.h b/vulkan/libvulkan/driver.h index d74d9e917f..e05843997c 100644 --- a/vulkan/libvulkan/driver.h +++ b/vulkan/libvulkan/driver.h @@ -22,7 +22,7 @@ #include <bitset> #include <type_traits> -#include <android/log.h> +#include <log/log.h> #include <vulkan/vulkan.h> #include <hardware/hwvulkan.h> diff --git a/vulkan/libvulkan/driver_gen.cpp b/vulkan/libvulkan/driver_gen.cpp index e27b3d17ca..dac6e927f5 100644 --- a/vulkan/libvulkan/driver_gen.cpp +++ b/vulkan/libvulkan/driver_gen.cpp @@ -17,8 +17,10 @@ // WARNING: This file is generated. See ../README.md for instructions. #include <string.h> + #include <algorithm> -#include <android/log.h> + +#include <log/log.h> #include "driver.h" diff --git a/vulkan/libvulkan/layers_extensions.cpp b/vulkan/libvulkan/layers_extensions.cpp index 5f6d2438a4..05856d3c1c 100644 --- a/vulkan/libvulkan/layers_extensions.cpp +++ b/vulkan/libvulkan/layers_extensions.cpp @@ -26,10 +26,10 @@ #include <string> #include <vector> -#include <android/log.h> #include <android/dlext.h> #include <android-base/strings.h> #include <cutils/properties.h> +#include <log/log.h> #include <ziparchive/zip_archive.h> #include <vulkan/vulkan_loader_data.h> diff --git a/vulkan/libvulkan/stubhal.cpp b/vulkan/libvulkan/stubhal.cpp index 3de8970475..2926268488 100644 --- a/vulkan/libvulkan/stubhal.cpp +++ b/vulkan/libvulkan/stubhal.cpp @@ -30,7 +30,7 @@ #include <bitset> #include <mutex> -#include <android/log.h> +#include <log/log.h> #include <hardware/hwvulkan.h> #include "stubhal.h" diff --git a/vulkan/libvulkan/swapchain.cpp b/vulkan/libvulkan/swapchain.cpp index 807b81a8ed..e069b5dc14 100644 --- a/vulkan/libvulkan/swapchain.cpp +++ b/vulkan/libvulkan/swapchain.cpp @@ -16,7 +16,7 @@ #include <algorithm> -#include <android/log.h> +#include <log/log.h> #include <gui/BufferQueue.h> #include <sync/sync.h> #include <utils/StrongPointer.h> diff --git a/vulkan/nulldrv/null_driver.cpp b/vulkan/nulldrv/null_driver.cpp index 4a520ee878..89c65af44a 100644 --- a/vulkan/nulldrv/null_driver.cpp +++ b/vulkan/nulldrv/null_driver.cpp @@ -23,7 +23,7 @@ #include <algorithm> #include <array> -#include <android/log.h> +#include <log/log.h> #include <utils/Errors.h> #include "null_driver_gen.h" |