diff options
| author | Torne (Richard Coles) <torne@google.com> | 2014-01-07 12:20:13 +0000 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2014-01-07 12:20:13 +0000 |
| commit | c9e25bc113fd575a634ba8495137d970d7b3d403 (patch) | |
| tree | 197863e4a0a3110e113a96994d07f5d672d90154 | |
| parent | 16ac00980fbf8d138fd0eb2370d94c5af4f83535 (diff) | |
| parent | 41532af52a1b6dabdbfdb3681b8e068ecd553e31 (diff) | |
| download | gyp-c9e25bc113fd575a634ba8495137d970d7b3d403.tar.gz | |
Merge from Chromium at DEPS revision 33.0.1750.16
This commit was generated by merge_to_master.py.
Change-Id: If46999dad9fd1f617d69aa2978010256d1b89135
| -rw-r--r-- | core.gypi | 1 | ||||
| -rw-r--r-- | public_headers.gypi | 1 | ||||
| -rw-r--r-- | tools.gyp | 44 |
3 files changed, 26 insertions, 20 deletions
@@ -279,7 +279,6 @@ '<(skia_include_path)/core/SkRegion.h', '<(skia_include_path)/core/SkRRect.h', '<(skia_include_path)/core/SkScalar.h', - '<(skia_include_path)/core/SkScalarCompare.h', '<(skia_include_path)/core/SkShader.h', '<(skia_include_path)/core/SkStream.h', '<(skia_include_path)/core/SkString.h', diff --git a/public_headers.gypi b/public_headers.gypi index 45114e8..b8c5016 100644 --- a/public_headers.gypi +++ b/public_headers.gypi @@ -218,7 +218,6 @@ 'core/SkStrokeRec.h', 'core/SkImageDecoder.h', 'core/SkTime.h', - 'core/SkScalarCompare.h', 'core/SkPathMeasure.h', 'core/SkMaskFilter.h', 'core/SkBounder.h', @@ -141,8 +141,8 @@ '../tools/skhello.cpp', ], 'dependencies': [ - 'pdf.gyp:pdf', 'flags.gyp:flags', + 'pdf.gyp:pdf', ], }], ], @@ -158,10 +158,10 @@ '../src/utils/', ], 'dependencies': [ - 'skia_lib.gyp:skia_lib', 'flags.gyp:flags', 'gm.gyp:gm_expectations', 'jsoncpp.gyp:jsoncpp', + 'skia_lib.gyp:skia_lib', 'utils.gyp:utils', ], }, @@ -174,13 +174,13 @@ '../src/utils/SkLua.cpp', ], 'dependencies': [ - 'skia_lib.gyp:skia_lib', 'effects.gyp:effects', - 'utils.gyp:utils', 'images.gyp:images', + 'lua.gyp:lua', 'pdf.gyp:pdf', 'ports.gyp:ports', - 'lua.gyp:lua', + 'skia_lib.gyp:skia_lib', + 'utils.gyp:utils', ], }, { @@ -192,16 +192,16 @@ '../src/utils/SkLua.cpp', ], 'dependencies': [ - 'skia_lib.gyp:skia_lib', 'effects.gyp:effects', - 'utils.gyp:utils', + 'flags.gyp:flags', 'images.gyp:images', + 'lua.gyp:lua', 'tools.gyp:picture_renderer', 'tools.gyp:picture_utils', 'pdf.gyp:pdf', 'ports.gyp:ports', - 'flags.gyp:flags', - 'lua.gyp:lua', + 'skia_lib.gyp:skia_lib', + 'utils.gyp:utils', ], }, { @@ -217,10 +217,10 @@ '../src/pipe/utils/', ], 'dependencies': [ + 'flags.gyp:flags', 'skia_lib.gyp:skia_lib', 'tools.gyp:picture_renderer', 'tools.gyp:picture_utils', - 'flags.gyp:flags', ], }, { @@ -240,11 +240,11 @@ '../src/lazy/', ], 'dependencies': [ + 'bench.gyp:bench_timer', + 'flags.gyp:flags', 'skia_lib.gyp:skia_lib', 'tools.gyp:picture_utils', 'tools.gyp:picture_renderer', - 'bench.gyp:bench_timer', - 'flags.gyp:flags', ], }, { @@ -268,10 +268,18 @@ '../src/pipe/utils/', '../src/utils/', ], + 'direct_dependent_settings': { + 'include_dirs': [ + # needed for JSON headers used within PictureRenderer.h + '../third_party/externals/jsoncpp-chromium/overrides/include/', + '../third_party/externals/jsoncpp/include/', + ], + }, 'dependencies': [ + 'flags.gyp:flags', + 'jsoncpp.gyp:jsoncpp', 'skia_lib.gyp:skia_lib', 'tools.gyp:picture_utils', - 'flags.gyp:flags', ], 'conditions': [ ['skia_gpu == 1', @@ -296,8 +304,8 @@ '../src/utils/', ], 'dependencies': [ - 'skia_lib.gyp:skia_lib', 'pdf.gyp:pdf', + 'skia_lib.gyp:skia_lib', 'tools.gyp:picture_utils', ], 'conditions': [ @@ -359,9 +367,9 @@ '../tools/pinspect.cpp', ], 'dependencies': [ + 'flags.gyp:flags', 'skia_lib.gyp:skia_lib', 'tools.gyp:picture_renderer', - 'flags.gyp:flags', ], }, { @@ -379,11 +387,11 @@ '../bench/TimerData.cpp', ], 'dependencies': [ - 'skia_lib.gyp:skia_lib', 'bench.gyp:bench_timer', - 'tools.gyp:picture_utils', - 'tools.gyp:picture_renderer', 'flags.gyp:flags', + 'skia_lib.gyp:skia_lib', + 'tools.gyp:picture_renderer', + 'tools.gyp:picture_utils', ], }, { |