In Google3 build, use SK_SFNTLY_SUBSETTER define to enable/disable sfntly.

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1561753002

Review URL: https://codereview.chromium.org/1561753002
This commit is contained in:
benjaminwagner 2016-01-05 17:00:04 -08:00 committed by Commit bot
parent 221524de3b
commit bc348f41a7
2 changed files with 5 additions and 5 deletions

View File

@ -400,6 +400,7 @@ DEFINES_IOS = [
DEFINES_UNIX = [
"SK_BUILD_FOR_UNIX",
"SK_SAMPLES_FOR_X",
"SK_SFNTLY_SUBSETTER",
]
DEFINES_ALL = [

View File

@ -24,14 +24,13 @@
#include "SkTypes.h"
#include "SkUtils.h"
#if defined (GOOGLE3)
#if !defined (SK_BUILD_FOR_ANDROID) && !defined (SK_BUILD_FOR_IOS)
#if defined (SK_SFNTLY_SUBSETTER)
#if defined (GOOGLE3)
// #including #defines doesn't work with this build system.
#include "typography/font/sfntly/src/sample/chromium/font_subsetter.h"
#define SK_SFNTLY_SUBSETTER // For the benefit of #ifdefs below.
#else
#include SK_SFNTLY_SUBSETTER
#endif
#elif defined (SK_SFNTLY_SUBSETTER)
#include SK_SFNTLY_SUBSETTER
#endif
// PDF's notion of symbolic vs non-symbolic is related to the character set, not