| commit | 7823e124e00576e20e47ec717cbe8bc89f0f2bf2 | [log] [tgz] |
|---|---|---|
| author | Mark Salyzyn <salyzyn@google.com> | Thu Sep 29 08:08:05 2016 -0700 |
| committer | Mark Salyzyn <salyzyn@google.com> | Wed Jan 11 15:07:17 2017 -0800 |
| tree | b0d7ec03dfc3d58408a9616b7125a77a4ca4439c | |
| parent | 5cfc1c0546d797ebca9bdc3645585e33cc0c1193 [diff] |
Replace cutils/log.h and rationalize log/log.h and android/log.h - cutils/log.h treat as deprecated and lead by example - android/log.h to be used instead of log/log.h if possible - add system includes that are assumed as side effects - define LOG_TAG first Test: compile Bug: 31289077 Bug: 30465923 Change-Id: I8d99b24c333578c9b5aa9f2a01324bd0bba268dd
diff --git a/services/surfaceflinger/DisplayHardware/FramebufferSurface.cpp b/services/surfaceflinger/DisplayHardware/FramebufferSurface.cpp index 5ef83c0..cdfe34a 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 ad287c1..617ea9f 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 66fc13d..f0ded39 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 0b4cd3a..52cbb34 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>