diff options
| author | 2021-05-21 15:14:07 -0700 | |
|---|---|---|
| committer | 2021-05-22 00:12:57 +0000 | |
| commit | 60f46b51f613f96da6c7bde5b135933900fa7688 (patch) | |
| tree | 9d9ff82cbfd3f4bb61b797608e5f639316573ddc | |
| parent | 7f09431b9fbc146c10c069f1ae3397ec1b7655da (diff) | |
Move TraceUtils.h to gui to share with libhwui.
Test: It makes
Change-Id: I630b28230b089c2bfd2c6449b658cc759947a2ae
Bug: 183120308
| -rw-r--r-- | libs/gui/include/gui/TraceUtils.h (renamed from services/surfaceflinger/TraceUtils.h) | 3 | ||||
| -rw-r--r-- | services/surfaceflinger/SurfaceFlinger.cpp | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/services/surfaceflinger/TraceUtils.h b/libs/gui/include/gui/TraceUtils.h index 90a34a5ed8..b9ec14aaf0 100644 --- a/services/surfaceflinger/TraceUtils.h +++ b/libs/gui/include/gui/TraceUtils.h @@ -14,9 +14,6 @@ * limitations under the License. */ -// TODO(b/183120308): This file is a copy of f/b/libs/hwui/utils/TraceUtils.h -// It should be migrated to a common place where both SF and hwui could use it. - #pragma once #include <cutils/trace.h> diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp index 7085eaf86a..0e222abbe2 100644 --- a/services/surfaceflinger/SurfaceFlinger.cpp +++ b/services/surfaceflinger/SurfaceFlinger.cpp @@ -23,7 +23,6 @@ #define ATRACE_TAG ATRACE_TAG_GRAPHICS #include "SurfaceFlinger.h" -#include "TraceUtils.h" #include <android-base/properties.h> #include <android/configuration.h> @@ -58,6 +57,7 @@ #include <gui/LayerMetadata.h> #include <gui/LayerState.h> #include <gui/Surface.h> +#include <gui/TraceUtils.h> #include <hidl/ServiceManagement.h> #include <layerproto/LayerProtoParser.h> #include <log/log.h> |