Chromium Code Reviews| Index: gyp/freetype.gyp |
| diff --git a/gyp/freetype.gyp b/gyp/freetype.gyp |
| index 6717c78f65ca01c8e066357771c11b8199cd6e9b..9e4b94f466e075a148711413915a4f4e2c854c25 100644 |
| --- a/gyp/freetype.gyp |
| +++ b/gyp/freetype.gyp |
| @@ -5,39 +5,41 @@ |
| 'target_name': 'freetype', |
| 'type': 'none', |
| 'conditions': [ |
| - [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "chromeos"]', { |
| - 'direct_dependent_settings': { |
| - 'include_dirs' : [ |
| - '/usr/include/freetype2', |
| + [ 'skia_freetype_static', |
| + { |
| + 'dependencies': [ |
| + 'freetype_static' |
| ], |
| - 'link_settings': { |
| - 'libraries': [ |
| - '-lfreetype', |
| - ], |
| + 'export_dependent_settings': [ |
| + 'freetype_static' |
| + ], |
| + 'direct_dependent_settings': { |
| 'defines': [ |
| - #The font host requires at least FreeType 2.3.0 at runtime. |
| - 'SK_FONTHOST_FREETYPE_RUNTIME_VERSION=0x020300',\ |
| - 'SK_CAN_USE_DLOPEN=1', |
| + # Both Android and NaCl provide at least FreeType 2.4.0 |
| + 'SK_FONTHOST_FREETYPE_RUNTIME_VERSION=0x020400', |
|
scroggo
2014/02/19 18:33:57
If I understand Eric's comment in https://coderevi
borenet
2014/02/21 15:24:34
Yes, everything in this block only makes sense on
hal.canary
2014/02/24 17:42:35
I think I've got it right now.
|
| + 'SK_CAN_USE_DLOPEN=0', |
| ], |
| - } |
| - }, |
| - }], |
| - [ 'skia_os in ["android", "nacl"]', { |
| - 'dependencies': [ |
| - 'freetype_static' |
| - ], |
| - 'export_dependent_settings': [ |
| - 'freetype_static' |
| - ], |
| - 'direct_dependent_settings': { |
| - 'defines': [ |
| - # Both Android and NaCl provide at least FreeType 2.4.0 |
| - 'SK_FONTHOST_FREETYPE_RUNTIME_VERSION=0x020400', |
| - 'SK_CAN_USE_DLOPEN=0', |
| - ], |
| - }, |
| - }], |
| - [ 'skia_android_framework', { |
| + }, |
| + }, { # (not skia_freetype_static) |
| + 'direct_dependent_settings': { |
| + 'include_dirs' : [ |
| + '/usr/include/freetype2', |
| + ], |
| + 'link_settings': { |
| + 'libraries': [ |
| + '-lfreetype', |
| + ], |
| + 'defines': [ |
| + #The font host requires at least FreeType 2.3.0 at runtime. |
| + 'SK_FONTHOST_FREETYPE_RUNTIME_VERSION=0x020300', |
| + 'SK_CAN_USE_DLOPEN=1', |
| + ], |
| + } |
| + }, |
| + } |
| + ], |
| + [ 'skia_android_framework', |
| + { |
| 'include_dirs': [ |
| 'external/expat/lib', |
| 'external/freetype/include', |
| @@ -61,7 +63,7 @@ |
| 'standalone_static_library': 1, |
| 'dependencies': [ |
| # we are dependent upon PNG for color emoji glyphs |
| - 'images.gyp:images' |
| + 'libpng.gyp:libpng', |
| ], |
| 'includes': [ |
| # common freetype sources needed for both the base Skia build and the |