diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2013-12-11 12:52:51 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2013-12-11 12:52:51 +0000 |
| commit | 0a66bc0344f154eded89900b1dff24eaa6df16a8 (patch) | |
| tree | f8973e0d100319ee8fe4fe9b14f763dd6b6abb56 | |
| parent | 0fbe36078ded1134b86bde79515e9034c947fec9 (diff) | |
| parent | b95138495e05dd49e1622e4dc9edc2d4c9781134 (diff) | |
| download | gyp-0a66bc0344f154eded89900b1dff24eaa6df16a8.tar.gz | |
Merge third_party/skia/gyp from https://chromium.googlesource.com/external/skia/gyp.git at b95138495e05dd49e1622e4dc9edc2d4c9781134
This commit was generated by merge_from_chromium.py.
Change-Id: I3d8f570d0040b351a4295d059923ebac07d61a07
| -rw-r--r-- | common_conditions.gypi | 2 | ||||
| -rw-r--r-- | core.gypi | 1 | ||||
| -rw-r--r-- | gmslides.gypi | 2 | ||||
| -rw-r--r-- | gpu.gypi | 4 |
4 files changed, 6 insertions, 3 deletions
diff --git a/common_conditions.gypi b/common_conditions.gypi index 8d8ae14..83bc561 100644 --- a/common_conditions.gypi +++ b/common_conditions.gypi @@ -5,7 +5,7 @@ 'SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=<(skia_static_initializers)', 'SK_SUPPORT_GPU=<(skia_gpu)', 'SK_SUPPORT_OPENCL=<(skia_opencl)', - 'SK_DISTANCEFIELD_FONTSC=<(skia_distancefield_fonts)', + 'SK_DISTANCEFIELD_FONTS=<(skia_distancefield_fonts)', ], 'conditions' : [ [ 'skia_os == "win"', @@ -106,6 +106,7 @@ '<(skia_src_path)/core/SkInstCnt.cpp', '<(skia_src_path)/core/SkImageFilter.cpp', '<(skia_src_path)/core/SkImageFilterUtils.cpp', + '<(skia_src_path)/core/SkImageInfo.cpp', '<(skia_src_path)/core/SkLineClipper.cpp', '<(skia_src_path)/core/SkMallocPixelRef.cpp', '<(skia_src_path)/core/SkMask.cpp', diff --git a/gmslides.gypi b/gmslides.gypi index f8f38e9..e29a702 100644 --- a/gmslides.gypi +++ b/gmslides.gypi @@ -20,6 +20,8 @@ '../gm/bitmaprect.cpp', '../gm/bitmaprecttest.cpp', '../gm/bitmapscroll.cpp', + '../gm/bitmapshader.cpp', + '../gm/bitmapsource.cpp', '../gm/bleed.cpp', '../gm/blurs.cpp', '../gm/blurquickreject.cpp', @@ -141,8 +141,8 @@ '<(skia_src_path)/gpu/effects/GrSimpleTextureEffect.h', '<(skia_src_path)/gpu/effects/GrSingleTextureEffect.cpp', '<(skia_src_path)/gpu/effects/GrSingleTextureEffect.h', - '<(skia_src_path)/gpu/effects/GrTextureDomainEffect.cpp', - '<(skia_src_path)/gpu/effects/GrTextureDomainEffect.h', + '<(skia_src_path)/gpu/effects/GrTextureDomain.cpp', + '<(skia_src_path)/gpu/effects/GrTextureDomain.h', '<(skia_src_path)/gpu/effects/GrTextureStripAtlas.cpp', '<(skia_src_path)/gpu/effects/GrTextureStripAtlas.h', |