diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2013-08-08 12:05:22 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2013-08-08 12:05:22 +0000 |
| commit | 7f1085bdd287523071b1fc8f4d01bfa8f5b1d3cc (patch) | |
| tree | 059ab4511946df7599ea05b9b9f7017c8675617e | |
| parent | 746ca77315235abb651c35dcc92609bf5f9f35ce (diff) | |
| parent | 3366cfd554f29ba78df0de1c8f742f6d544d33fd (diff) | |
| download | gyp-7f1085bdd287523071b1fc8f4d01bfa8f5b1d3cc.tar.gz | |
Merge third_party/skia/gyp from https://chromium.googlesource.com/external/skia/gyp.git at 3366cfd554f29ba78df0de1c8f742f6d544d33fd
This commit was generated by merge_from_chromium.py.
Change-Id: Iddf6ec8ba3a0db1af29e04cc8f1d557c7e75bcca
| -rw-r--r-- | common_conditions.gypi | 2 | ||||
| -rw-r--r-- | effects.gypi | 2 | ||||
| -rw-r--r-- | gmslides.gypi | 1 |
3 files changed, 5 insertions, 0 deletions
diff --git a/common_conditions.gypi b/common_conditions.gypi index c9d24ae..e046b13 100644 --- a/common_conditions.gypi +++ b/common_conditions.gypi @@ -32,6 +32,7 @@ { 'defines': [ 'SK_BUILD_FOR_WIN32', + 'SK_FONTHOST_USES_FONTMGR', 'SK_IGNORE_STDINT_DOT_H', '_CRT_SECURE_NO_WARNINGS', 'GR_GL_FUNCTION_TYPE=__stdcall', @@ -293,6 +294,7 @@ }, 'defines': [ 'SK_BUILD_FOR_MAC', + 'SK_FONTHOST_USES_FONTMGR', ], 'conditions' : [ [ 'skia_arch_width == 64', { diff --git a/effects.gypi b/effects.gypi index 05ce569..84d38ac 100644 --- a/effects.gypi +++ b/effects.gypi @@ -27,6 +27,7 @@ '<(skia_src_path)/effects/SkDashPathEffect.cpp', '<(skia_src_path)/effects/SkDiscretePathEffect.cpp', '<(skia_src_path)/effects/SkDisplacementMapEffect.cpp', + '<(skia_src_path)/effects/SkDropShadowImageFilter.cpp', '<(skia_src_path)/effects/SkEmbossMask.cpp', '<(skia_src_path)/effects/SkEmbossMask.h', '<(skia_src_path)/effects/SkEmbossMask_Table.h', @@ -90,6 +91,7 @@ '<(skia_include_path)/effects/SkDiscretePathEffect.h', '<(skia_include_path)/effects/SkDisplacementMapEffect.h', '<(skia_include_path)/effects/SkDrawExtraPathEffect.h', + '<(skia_include_path)/effects/SkDropShadowImageFilter.h', '<(skia_include_path)/effects/SkEmbossMaskFilter.h', '<(skia_include_path)/effects/SkGradientShader.h', '<(skia_include_path)/effects/SkKernel33MaskFilter.h', diff --git a/gmslides.gypi b/gmslides.gypi index 6729835..8d0b2e9 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -28,6 +28,7 @@ '../gm/composeshader.cpp', #'../gm/conicpaths.cpp', '../gm/convexpaths.cpp', + '../gm/copyTo4444.cpp', '../gm/cubicpaths.cpp', '../gm/cmykjpeg.cpp', '../gm/degeneratesegments.cpp', |