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

Commit ee708fac authored by Leon Scroggins III's avatar Leon Scroggins III
Browse files

Remove unnecessary dependency, and fix the chain 

Test: No new tests. This should not affect behavior; only dependencies.

Font.h does not need to include SkGlyphCache.h, and doing so requires
a transitive dependency on external/skia/src/utils, which was not
intended. Forward declare it instead, and fix the build errors that
resulted.

Change-Id: Ifd09430bb848d51b139df0f0c06c63e7e48711eb
parent 6ae13327

libs/hwui/font/Font.h

+3 −1
Original line number Diff line number Diff line
@@ -22,14 +22,16 @@ 
#include <utils/KeyedVector.h>



#include <SkScalar.h>

#include <SkGlyphCache.h>

#include <SkPaint.h>

#include <SkPathMeasure.h>

#include <SkTypeface.h>



#include "FontUtil.h"

#include "../Rect.h"

#include "../Matrix.h"



class SkGlyphCache;



namespace android {

namespace uirenderer {

libs/hwui/pipeline/skia/SkiaPipeline.cpp

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 


#include "utils/TraceUtils.h"

#include <SkImageEncoder.h>

#include <SkImagePriv.h>

#include <SkOSFile.h>

#include <SkOverdrawCanvas.h>

#include <SkOverdrawColorFilter.h>

libs/hwui/pipeline/skia/SkiaRecordingCanvas.cpp

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include "LayerDrawable.h"

#include "NinePatchUtils.h"

#include "pipeline/skia/AnimatedDrawables.h"

#include <SkImagePriv.h>



namespace android {

namespace uirenderer {

libs/hwui/tests/common/TestUtils.cpp

+2 −0
Original line number Diff line number Diff line
@@ -24,6 +24,8 @@ 
#include <utils/Unicode.h>

#include <SkClipStack.h>



#include <SkGlyphCache.h>



namespace android {

namespace uirenderer {

libs/hwui/tests/common/scenes/BitmapShaders.cpp

+2 −1
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include "TestSceneBase.h"

#include "utils/Color.h"

#include "tests/common/BitmapAllocationTestUtils.h"

#include <SkImagePriv.h>



class BitmapShaders;