Merge "Clean up Minikin includes" into lmp-dev

8 files changed, 11 insertions, 14 deletions

diff --git a/core/jni/android/graphics/MinikinSkia.cpp b/core/jni/android/graphics/MinikinSkia.cpp
index 25eb941e9d8e..ae2901471fdb 100644
--- a/core/jni/android/graphics/MinikinSkia.cpp
+++ b/core/jni/android/graphics/MinikinSkia.cpp
@@ -20,7 +20,6 @@
 #define LOG_TAG "Minikin"
 #include <cutils/log.h>
 
-#include <minikin/MinikinFont.h>
 #include "MinikinSkia.h"
 
 namespace android {
diff --git a/core/jni/android/graphics/MinikinSkia.h b/core/jni/android/graphics/MinikinSkia.h
index ac4d2a08ef43..255617e56ad1 100644
--- a/core/jni/android/graphics/MinikinSkia.h
+++ b/core/jni/android/graphics/MinikinSkia.h
@@ -14,6 +14,11 @@
  * limitations under the License.
  */
 
+#ifndef ANDROID_MINIKIN_SKIA_H
+#define ANDROID_MINIKIN_SKIA_H
+
+#include <minikin/MinikinFont.h>
+
 namespace android {
 
 class MinikinFontSkia : public MinikinFont {
@@ -47,4 +52,6 @@ private:
     SkTypeface *mTypeface;
 };
 
-}  // namespace android
\ No newline at end of file
+}  // namespace android
+
+#endif  // ANDROID_MINIKIN_SKIA_H
\ No newline at end of file
diff --git a/core/jni/android/graphics/MinikinUtils.cpp b/core/jni/android/graphics/MinikinUtils.cpp
index b3ed6f067935..47f72c4349dd 100644
--- a/core/jni/android/graphics/MinikinUtils.cpp
+++ b/core/jni/android/graphics/MinikinUtils.cpp
@@ -19,10 +19,8 @@
 #include <string>
 
 #include "SkPathMeasure.h"
-#include "minikin/Layout.h"
 #include "Paint.h"
 #include "TypefaceImpl.h"
-#include "MinikinSkia.h"
 
 #include "MinikinUtils.h"
 
diff --git a/core/jni/android/graphics/MinikinUtils.h b/core/jni/android/graphics/MinikinUtils.h
index 647cbd8376dd..3646c1a5c0aa 100644
--- a/core/jni/android/graphics/MinikinUtils.h
+++ b/core/jni/android/graphics/MinikinUtils.h
@@ -24,7 +24,10 @@
 #ifndef ANDROID_MINIKIN_UTILS_H
 #define ANDROID_MINIKIN_UTILS_H
 
+#include <minikin/Layout.h>
 #include "Paint.h"
+#include "MinikinSkia.h"
+#include "TypefaceImpl.h"
 
 namespace android {
 
@@ -40,9 +43,6 @@ enum {
     kBidi_Mask = 0x7
 };
 
-class Layout;
-class TypefaceImpl;
-
 class MinikinUtils {
 public:
     static void doLayout(Layout* layout, const Paint* paint, int bidiFlags, TypefaceImpl* typeface,
diff --git a/core/jni/android/graphics/Paint.cpp b/core/jni/android/graphics/Paint.cpp
index a1f09bde12e9..46654867b05b 100644
--- a/core/jni/android/graphics/Paint.cpp
+++ b/core/jni/android/graphics/Paint.cpp
@@ -36,7 +36,6 @@
 #include "utils/Blur.h"
 
 #include <minikin/GraphemeBreak.h>
-#include <minikin/Layout.h>
 #include "MinikinSkia.h"
 #include "MinikinUtils.h"
 #include "Paint.h"
diff --git a/core/jni/android/graphics/SkiaCanvas.cpp b/core/jni/android/graphics/SkiaCanvas.cpp
index 61ad398a1c12..c7255a178361 100644
--- a/core/jni/android/graphics/SkiaCanvas.cpp
+++ b/core/jni/android/graphics/SkiaCanvas.cpp
@@ -30,8 +30,6 @@
 #include "SkTArray.h"
 #include "SkTemplates.h"
 
-#include <minikin/Layout.h>
-#include "MinikinSkia.h"
 #include "MinikinUtils.h"
 
 #include "TypefaceImpl.h"
diff --git a/core/jni/android_graphics_Canvas.cpp b/core/jni/android_graphics_Canvas.cpp
index a9b01d0926de..96607d22f4cb 100644
--- a/core/jni/android_graphics_Canvas.cpp
+++ b/core/jni/android_graphics_Canvas.cpp
@@ -25,8 +25,6 @@
 #include "Paint.h"
 #include "TypefaceImpl.h"
 
-#include <minikin/Layout.h>
-#include "MinikinSkia.h"
 #include "MinikinUtils.h"
 
 namespace android {
diff --git a/core/jni/android_view_GLES20Canvas.cpp b/core/jni/android_view_GLES20Canvas.cpp
index 3cd031e870ca..ce76b26d6c89 100644
--- a/core/jni/android_view_GLES20Canvas.cpp
+++ b/core/jni/android_view_GLES20Canvas.cpp
@@ -44,8 +44,6 @@
 #include <CanvasProperty.h>
 #include <Paint.h>
 
-#include <minikin/Layout.h>
-#include "MinikinSkia.h"
 #include "MinikinUtils.h"
 
 namespace android {