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

Commit e81c22a2 authored by Rachel Lee's avatar Rachel Lee Committed by Android (Google) Code Review
Browse files

Merge "Use TraceUtils.h from gui shared library." into sc-dev

parents 06cd94a6 ce9762b5

libs/hwui/HardwareBitmapUploader.cpp

+1 −1
Original line number Diff line number Diff line
@@ -24,10 +24,10 @@ 
#include <GrDirectContext.h>

#include <SkCanvas.h>

#include <SkImage.h>

#include <gui/TraceUtils.h>

#include <utils/GLUtils.h>

#include <utils/NdkUtils.h>

#include <utils/Trace.h>

#include <utils/TraceUtils.h>



#include <thread>

libs/hwui/Readback.cpp

+1 −1
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include <sync/sync.h>

#include <system/window.h>



#include <gui/TraceUtils.h>

#include "DeferredLayerUpdater.h"

#include "Properties.h"

#include "hwui/Bitmap.h"
@@ -28,7 +29,6 @@ 
#include "utils/Color.h"

#include "utils/MathUtils.h"

#include "utils/NdkUtils.h"

#include "utils/TraceUtils.h"



using namespace android::uirenderer::renderthread;

libs/hwui/RenderNode.cpp

+1 −1
Original line number Diff line number Diff line
@@ -27,9 +27,9 @@ 
#include "DamageAccumulator.h"

#include "pipeline/skia/SkiaDisplayList.h"

#endif

#include <gui/TraceUtils.h>

#include "utils/MathUtils.h"

#include "utils/StringUtils.h"

#include "utils/TraceUtils.h"



#include <SkPathOps.h>

#include <algorithm>

libs/hwui/VectorDrawable.cpp

+1 −1
Original line number Diff line number Diff line
@@ -30,8 +30,8 @@ 
#include "renderthread/RenderThread.h"

#endif



#include <gui/TraceUtils.h>

#include "utils/Macros.h"

#include "utils/TraceUtils.h"

#include "utils/VectorDrawableUtils.h"



namespace android {

libs/hwui/hwui/AnimatedImageDrawable.cpp

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
#include "AnimatedImageThread.h"

#endif



#include "utils/TraceUtils.h"

#include <gui/TraceUtils.h>

#include "pipeline/skia/SkiaUtils.h"



#include <SkPicture.h>