Update the Skia gyp files to use the external android sources.
Review URL: http://codereview.appspot.com/5336048
git-svn-id: http://skia.googlecode.com/svn/trunk@2598 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/src/ports/SkFontHost_FreeType.cpp b/src/ports/SkFontHost_FreeType.cpp
index fa3c96a..1a3fad9 100644
--- a/src/ports/SkFontHost_FreeType.cpp
+++ b/src/ports/SkFontHost_FreeType.cpp
@@ -322,8 +322,10 @@
}
static bool canEmbed(FT_Face face) {
-// The android port of FreeType does not build
-#if defined(FT_FSTYPE_RESTRICTED_LICENSE_EMBEDDING)
+// The Android freetype library does not compile the FT_Get_FSType_Flags
+// function, so we are required to add the !defined(SK_BUILD_FOR_ANDROID) until
+// support is added to Androids port of freetype.
+#if defined(FT_FSTYPE_RESTRICTED_LICENSE_EMBEDDING) && !defined(SK_BUILD_FOR_ANDROID)
FT_UShort fsType = FT_Get_FSType_Flags(face);
return (fsType & (FT_FSTYPE_RESTRICTED_LICENSE_EMBEDDING |
FT_FSTYPE_BITMAP_EMBEDDING_ONLY)) == 0;