Remove freetype dependency from core.gyp

Review URL: https://codereview.chromium.org/13975014

git-svn-id: http://skia.googlecode.com/svn/trunk@8677 2bbb7eff-a529-9590-31e7-b0007b416f81

diff --git a/gyp/core.gyp b/gyp/core.gyp
index 5f99fd911ef4f52887dcca051c1f97426887ef8e..cc5cfbd3887acebb77e8a41b52fbb8533a027fa5 100644 (file)
--- a/gyp/core.gyp
+++ b/gyp/core.gyp
@@ -75,7 +75,7 @@
             'config/win',
           ],
         }],
-        [ 'skia_os in ("android", "nacl")', {
+        [ 'skia_os == "nacl"', {
           'dependencies': [
             'freetype.gyp:freetype',
           ],

diff --git a/src/core/SkAdvancedTypefaceMetrics.cpp b/src/core/SkAdvancedTypefaceMetrics.cpp
index e41bb810b5df3e9d36f4f21a6ea905741f5b3a80..fb1325cc695aa9c3223ff3de9451f44a43c6dfa1 100644 (file)
--- a/src/core/SkAdvancedTypefaceMetrics.cpp
+++ b/src/core/SkAdvancedTypefaceMetrics.cpp
@@ -16,7 +16,7 @@ SK_DEFINE_INST_COUNT(SkAdvancedTypefaceMetrics)
 #include <dwrite.h>
 #endif
 
-#if defined(SK_BUILD_FOR_UNIX) || defined(SK_BUILD_FOR_ANDROID)
+#if defined(SK_BUILD_FOR_NACL)
 #include <ft2build.h>
 #include FT_FREETYPE_H
 #endif
@@ -268,6 +268,8 @@ template SkAdvancedTypefaceMetrics::WidthRange* getAdvanceData(
         uint32_t subsetGlyphIDsLength,
         bool (*getAdvance)(IDWriteFontFace* fontFace, int gId, int16_t* data));
 #elif defined(SK_BUILD_FOR_UNIX) || defined(SK_BUILD_FOR_ANDROID)
+struct FT_FaceRec;
+typedef struct FT_FaceRec_* FT_Face;
 template SkAdvancedTypefaceMetrics::WidthRange* getAdvanceData(
         FT_Face face,
         int num_glyphs,