From 12ca8453a32eeeee18df05f31705e8fc056590e2 Mon Sep 17 00:00:00 2001 From: Brian Osman Date: Wed, 24 Apr 2019 13:50:21 -0400 Subject: [PATCH] Fix include paths in libtxt to prepare for upcoming Skia build change (flutter/engine#8723) * Fix include paths in libtxt to prepare for upcoming Skia build change Red test results are due to a different change. This PR fixes compile issues on the Skia side, and ensures that the next Skia -> Flutter roll can land properly. --- engine/src/flutter/third_party/txt/src/txt/font_skia.cc | 2 +- engine/src/flutter/third_party/txt/src/txt/font_skia.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/engine/src/flutter/third_party/txt/src/txt/font_skia.cc b/engine/src/flutter/third_party/txt/src/txt/font_skia.cc index 705e014fa50..e0dc2639297 100644 --- a/engine/src/flutter/third_party/txt/src/txt/font_skia.cc +++ b/engine/src/flutter/third_party/txt/src/txt/font_skia.cc @@ -15,7 +15,7 @@ */ #include "font_skia.h" -#include "SkFont.h" +#include "third_party/skia/include/core/SkFont.h" #include diff --git a/engine/src/flutter/third_party/txt/src/txt/font_skia.h b/engine/src/flutter/third_party/txt/src/txt/font_skia.h index b595c127517..ee31ccc6ad8 100644 --- a/engine/src/flutter/third_party/txt/src/txt/font_skia.h +++ b/engine/src/flutter/third_party/txt/src/txt/font_skia.h @@ -14,10 +14,10 @@ * limitations under the License. */ -#include -#include #include #include "flutter/fml/macros.h" +#include "third_party/skia/include/core/SkPaint.h" +#include "third_party/skia/include/core/SkTypeface.h" namespace txt {