Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(41)

Side by Side Diff: gyp/tools.gyp

Issue 343283002: No need to include ../tools/flags in include_dirs when depending on flags target. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: rebase Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « gyp/pathops_unittest.gyp ('k') | gyp/v8.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # GYP file to build various tools. 1 # GYP file to build various tools.
2 # 2 #
3 # To build on Linux: 3 # To build on Linux:
4 # ./gyp_skia tools.gyp && make tools 4 # ./gyp_skia tools.gyp && make tools
5 # 5 #
6 { 6 {
7 'includes': [ 7 'includes': [
8 'apptype_console.gypi', 8 'apptype_console.gypi',
9 ], 9 ],
10 'targets': [ 10 'targets': [
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after
152 }, 152 },
153 { 153 {
154 'target_name': 'skpdiff', 154 'target_name': 'skpdiff',
155 'type': 'executable', 155 'type': 'executable',
156 'sources': [ 156 'sources': [
157 '../tools/skpdiff/skpdiff_main.cpp', 157 '../tools/skpdiff/skpdiff_main.cpp',
158 '../tools/skpdiff/SkDiffContext.cpp', 158 '../tools/skpdiff/SkDiffContext.cpp',
159 '../tools/skpdiff/SkImageDiffer.cpp', 159 '../tools/skpdiff/SkImageDiffer.cpp',
160 '../tools/skpdiff/SkPMetric.cpp', 160 '../tools/skpdiff/SkPMetric.cpp',
161 '../tools/skpdiff/skpdiff_util.cpp', 161 '../tools/skpdiff/skpdiff_util.cpp',
162 '../tools/flags/SkCommandLineFlags.cpp',
163 ], 162 ],
164 'include_dirs': [ 163 'include_dirs': [
165 '../tools/flags',
166 '../src/core/', # needed for SkTLList.h 164 '../src/core/', # needed for SkTLList.h
167 ], 165 ],
168 'dependencies': [ 166 'dependencies': [
167 'flags.gyp:flags',
169 'skia_lib.gyp:skia_lib', 168 'skia_lib.gyp:skia_lib',
170 ], 169 ],
171 'cflags': [ 170 'cflags': [
172 '-O3', 171 '-O3',
173 ], 172 ],
174 'conditions': [ 173 'conditions': [
175 [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "chromeos"]', { 174 [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "chromeos"]', {
176 'link_settings': { 175 'link_settings': {
177 'libraries': [ 176 'libraries': [
178 '-lrt', 177 '-lrt',
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
275 'skia_lib.gyp:skia_lib', 274 'skia_lib.gyp:skia_lib',
276 ], 275 ],
277 }, 276 },
278 { 277 {
279 'target_name': 'skpinfo', 278 'target_name': 'skpinfo',
280 'type': 'executable', 279 'type': 'executable',
281 'sources': [ 280 'sources': [
282 '../tools/skpinfo.cpp', 281 '../tools/skpinfo.cpp',
283 ], 282 ],
284 'include_dirs': [ 283 'include_dirs': [
285 '../tools/flags',
286 '../src/core/', 284 '../src/core/',
287 ], 285 ],
288 'dependencies': [ 286 'dependencies': [
289 'flags.gyp:flags', 287 'flags.gyp:flags',
290 'skia_lib.gyp:skia_lib', 288 'skia_lib.gyp:skia_lib',
291 ], 289 ],
292 }, 290 },
293 { 291 {
294 'target_name': 'gpuveto', 292 'target_name': 'gpuveto',
295 'type': 'executable', 293 'type': 'executable',
296 'sources': [ 294 'sources': [
297 '../tools/gpuveto.cpp', 295 '../tools/gpuveto.cpp',
298 '../tools/LazyDecodeBitmap.cpp', 296 '../tools/LazyDecodeBitmap.cpp',
299 ], 297 ],
300 'include_dirs': [ 298 'include_dirs': [
301 '../src/core/', 299 '../src/core/',
302 '../src/images', 300 '../src/images',
303 '../src/lazy', 301 '../src/lazy',
304 '../tools/flags',
305 ], 302 ],
306 'dependencies': [ 303 'dependencies': [
307 'flags.gyp:flags', 304 'flags.gyp:flags',
308 'skia_lib.gyp:skia_lib', 305 'skia_lib.gyp:skia_lib',
309 ], 306 ],
310 }, 307 },
311 { 308 {
312 'target_name': 'lua_app', 309 'target_name': 'lua_app',
313 'type': 'executable', 310 'type': 'executable',
314 'sources': [ 311 'sources': [
(...skipping 382 matching lines...) Expand 10 before | Expand all | Expand 10 after
697 'type': 'executable', 694 'type': 'executable',
698 'sources': [ 695 'sources': [
699 '../tools/win_lcid.cpp', 696 '../tools/win_lcid.cpp',
700 ], 697 ],
701 }, 698 },
702 ], 699 ],
703 }, 700 },
704 ], 701 ],
705 ], 702 ],
706 } 703 }
OLDNEW
« no previous file with comments | « gyp/pathops_unittest.gyp ('k') | gyp/v8.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698