From f41ca79112732abbea323b2653368fae5eda46db Mon Sep 17 00:00:00 2001 From: "djsollen@google.com" Date: Mon, 15 Apr 2013 14:02:32 +0000 Subject: [PATCH] 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 --- gyp/core.gyp | 2 +- src/core/SkAdvancedTypefaceMetrics.cpp | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/gyp/core.gyp b/gyp/core.gyp index 5f99fd911e..cc5cfbd388 100644 --- 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 e41bb810b5..fb1325cc69 100644 --- a/src/core/SkAdvancedTypefaceMetrics.cpp +++ b/src/core/SkAdvancedTypefaceMetrics.cpp @@ -16,7 +16,7 @@ SK_DEFINE_INST_COUNT(SkAdvancedTypefaceMetrics) #include #endif -#if defined(SK_BUILD_FOR_UNIX) || defined(SK_BUILD_FOR_ANDROID) +#if defined(SK_BUILD_FOR_NACL) #include #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,