diff options
| author |  halcanary <halcanary@google.com> | 2016-08-24 12:28:38 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-08-24 12:28:38 -0700 |
| commit | e37aa89c5c6f31e6ddf43d5e530dda4f127b0f5a (patch) | |
| tree | 52b5a6e7b48d94718ad4d47217ce5d072bb84b61 | |
| parent | c095df55e86e7126b0582856720bb9177b553ff1 (diff) | |
gyp/sfntly: set SK_SFNTLY_SUBSETTER uniformly
When Skia is built into the Android framework,
SK_SFNTLY_SUBSETTER="sample/chromium/font_subsetter.h".
This sets the same value for Skia's test framework
I will eventually move away from the
#include PREPROCESSOR_DEFINE
trick, which does not work everywhere.
No public API changes.
TBR=reed@google.com
Review-Url: https://codereview.chromium.org/2274223002
| -rw-r--r-- | gyp/sfntly.gyp | 4 | ||||
| -rw-r--r-- | include/config/SkUserConfig.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/gyp/sfntly.gyp b/gyp/sfntly.gyp index 91385618a5..7ee7b98633 100644 --- a/gyp/sfntly.gyp +++ b/gyp/sfntly.gyp @@ -14,9 +14,9 @@ 'sfntly_src_path': '../third_party/externals/sfntly/cpp/src', }, 'direct_dependent_settings': { - 'include_dirs': [ '<(sfntly_src_path)/sample/chromium', ], + 'include_dirs': [ '<(sfntly_src_path)', ], 'defines': [ - 'SK_SFNTLY_SUBSETTER="font_subsetter.h"', + 'SK_SFNTLY_SUBSETTER="sample/chromium/font_subsetter.h"', ], }, 'sources': [ diff --git a/include/config/SkUserConfig.h b/include/config/SkUserConfig.h index 3022b1fef6..0729447979 100644 --- a/include/config/SkUserConfig.h +++ b/include/config/SkUserConfig.h @@ -95,7 +95,7 @@ /* Define this to provide font subsetter in PDF generation. */ -//#define SK_SFNTLY_SUBSETTER "sfntly/subsetter/font_subsetter.h" +//#define SK_SFNTLY_SUBSETTER "sample/chromium/font_subsetter.h" /* Define this to set the upper limit for text to support LCD. Values that are very large increase the cost in the font cache and draw slower, without |