Merge "Remove unnecessary dependency, and fix the chain"

libs/hwui/font/Font.h

@@ -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

@@ -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

@@ -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

@@ -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

@@ -17,6 +17,7 @@
 #include "TestSceneBase.h"
 #include "utils/Color.h"
 #include "tests/common/BitmapAllocationTestUtils.h"
+#include <SkImagePriv.h>
 
 class BitmapShaders;
 
@@ -70,4 +71,4 @@ public:
     void doFrame(int frameNr) override { }
 
     BitmapAllocationTestUtils::BitmapAllocator mAllocator;
-};
+};

libs/hwui/tests/unit/RecordingCanvasTests.cpp

@@ -25,6 +25,7 @@
 #include <utils/Color.h>
 
 #include <SkGradientShader.h>
+#include <SkImagePriv.h>
 #include <SkShader.h>
 
 namespace android {