Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5bb4c515 authored by Rachel Lee's avatar Rachel Lee Committed by Automerger Merge Worker
Browse files

Merge "Move TraceUtils.h to gui to share with libhwui." into sc-dev am: 3554ef9b 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/14687247

Change-Id: Ic9792a28c617f7893b8c420875be7efcee11a4e7
parents 4d297805 3554ef9b

services/surfaceflinger/TraceUtils.h→libs/gui/include/gui/TraceUtils.h

+0 −3
Original line number Diff line number Diff line
@@ -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>

services/surfaceflinger/SurfaceFlinger.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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>