Index: gyp/tools.gyp |
diff --git a/gyp/tools.gyp b/gyp/tools.gyp |
index 04d4e3f0fc695b08b169f7378d011d1969a7a7ff..fd381b7a3253cae6905990358191454d6cbf442f 100644 |
--- a/gyp/tools.gyp |
+++ b/gyp/tools.gyp |
@@ -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', |
], |
}, |
{ |