AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove freetype dependency from core.gyp

Browse Source 
Committed: https://code.google.com/p/skia/source/detail?r=8677

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

git-svn-id: http://skia.googlecode.com/svn/trunk@8678 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
djsollen@google.com 2013-04-15 14:37:28 +00:00
parent f41ca79112
commit 856b984c51
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gyp/core.gyp
View File

@ -75,11 +75,6 @@
'config/win',
],
}],
[ 'skia_os == "nacl"', {
'dependencies': [
'freetype.gyp:freetype',
],
}],
[ 'skia_os == "android" and skia_arch_type == "arm" and armv7 == 1', {
# The code in SkUtilsArm.cpp can be used on an ARM-based Linux system, not only Android.
'sources': [

9
src/core/SkAdvancedTypefaceMetrics.cpp
View File

@ -16,9 +16,10 @@ SK_DEFINE_INST_COUNT(SkAdvancedTypefaceMetrics)
#include <dwrite.h>
#endif
#if defined(SK_BUILD_FOR_NACL)
#include <ft2build.h>
#include FT_FREETYPE_H
#if defined(SK_BUILD_FOR_UNIX) || defined(SK_BUILD_FOR_ANDROID)
// forward declare structs needed for getAdvanceData() template for freetype
struct FT_FaceRec;
typedef struct FT_FaceRec_* FT_Face;
#endif
#ifdef SK_BUILD_FOR_MAC
@ -268,8 +269,6 @@ 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,