Index: gyp/freetype.gyp |
diff --git a/gyp/freetype.gyp b/gyp/freetype.gyp |
index 6717c78f65ca01c8e066357771c11b8199cd6e9b..1c4056ad4580ec6a43a57436e9cb8af9efa61407 100644 |
--- a/gyp/freetype.gyp |
+++ b/gyp/freetype.gyp |
@@ -5,7 +5,7 @@ |
'target_name': 'freetype', |
scroggo
2014/02/06 16:22:13
You'll need to do a rebase onto my recent changes
hal.canary
2014/02/06 18:01:57
Done, if you mean https://codereview.chromium.org/
|
'type': 'none', |
'conditions': [ |
- [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "chromeos"]', { |
+ [ 'not skia_freetype_static and skia_os in ["linux", "freebsd", "openbsd", "solaris", "chromeos"]', { |
scroggo
2014/02/06 16:22:13
nit: over 100 chars.
hal.canary
2014/02/06 18:01:57
Done.
|
'direct_dependent_settings': { |
'include_dirs' : [ |
'/usr/include/freetype2', |
@@ -22,7 +22,7 @@ |
} |
}, |
}], |
- [ 'skia_os in ["android", "nacl"]', { |
+ [ 'skia_freetype_static or skia_os in ["android", "nacl"]', { |
scroggo
2014/02/06 16:22:13
Would it make more sense to define skia_freetype_s
hal.canary
2014/02/06 18:01:57
Done.
|
'dependencies': [ |
'freetype_static' |
], |
@@ -61,6 +61,7 @@ |
'standalone_static_library': 1, |
'dependencies': [ |
# we are dependent upon PNG for color emoji glyphs |
+ 'libpng.gyp:libpng', |
djsollen
2014/02/06 16:24:34
I don't think you need this if your pulling in the
hal.canary
2014/02/06 18:01:57
Not the way I am doing it. The libpng target puts
|
'images.gyp:images' |
], |
'includes': [ |