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

Side by Side Diff: gyp/tools.gyp

Issue 1260613006: Move SkTHash.h to include/private. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: rm Created 5 years, 4 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 | « no previous file | gyp/utils.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2015 Google Inc. 1 # Copyright 2015 Google Inc.
2 # 2 #
3 # Use of this source code is governed by a BSD-style license that can be 3 # Use of this source code is governed by a BSD-style license that can be
4 # found in the LICENSE file. 4 # found in the LICENSE file.
5 # GYP file to build various tools. 5 # GYP file to build various tools.
6 # 6 #
7 # To build on Linux: 7 # To build on Linux:
8 # ./gyp_skia tools.gyp && make tools 8 # ./gyp_skia tools.gyp && make tools
9 # 9 #
10 { 10 {
(...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after
168 'target_name': 'skpdiff', 168 'target_name': 'skpdiff',
169 'type': 'executable', 169 'type': 'executable',
170 'sources': [ 170 'sources': [
171 '../tools/skpdiff/skpdiff_main.cpp', 171 '../tools/skpdiff/skpdiff_main.cpp',
172 '../tools/skpdiff/SkDiffContext.cpp', 172 '../tools/skpdiff/SkDiffContext.cpp',
173 '../tools/skpdiff/SkImageDiffer.cpp', 173 '../tools/skpdiff/SkImageDiffer.cpp',
174 '../tools/skpdiff/SkPMetric.cpp', 174 '../tools/skpdiff/SkPMetric.cpp',
175 '../tools/skpdiff/skpdiff_util.cpp', 175 '../tools/skpdiff/skpdiff_util.cpp',
176 ], 176 ],
177 'include_dirs': [ 177 'include_dirs': [
178 '../include/private',
178 '../src/core/', # needed for SkTLList.h 179 '../src/core/', # needed for SkTLList.h
179 '../tools/', # needed for picture_utils::replace_char 180 '../tools/', # needed for picture_utils::replace_char
180 ], 181 ],
181 'dependencies': [ 182 'dependencies': [
182 'flags.gyp:flags', 183 'flags.gyp:flags',
183 'skia_lib.gyp:skia_lib', 184 'skia_lib.gyp:skia_lib',
184 'tools.gyp:picture_utils', 185 'tools.gyp:picture_utils',
185 ], 186 ],
186 'cflags': [ 187 'cflags': [
187 '-O3', 188 '-O3',
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
222 }], 223 }],
223 ], 224 ],
224 }, 225 },
225 { 226 {
226 'target_name': 'skpmaker', 227 'target_name': 'skpmaker',
227 'type': 'executable', 228 'type': 'executable',
228 'sources': [ 229 'sources': [
229 '../tools/skpmaker.cpp', 230 '../tools/skpmaker.cpp',
230 ], 231 ],
231 'include_dirs': [ 232 'include_dirs': [
233 '../include/private',
232 '../src/core', 234 '../src/core',
233 ], 235 ],
234 'dependencies': [ 236 'dependencies': [
235 'flags.gyp:flags', 237 'flags.gyp:flags',
236 'skia_lib.gyp:skia_lib', 238 'skia_lib.gyp:skia_lib',
237 ], 239 ],
238 }, 240 },
239 { 241 {
240 'target_name': 'skimagediff', 242 'target_name': 'skimagediff',
241 'type': 'executable', 243 'type': 'executable',
(...skipping 22 matching lines...) Expand all
264 '../tools/skhello.cpp', 266 '../tools/skhello.cpp',
265 ], 267 ],
266 }, 268 },
267 { 269 {
268 'target_name': 'skpinfo', 270 'target_name': 'skpinfo',
269 'type': 'executable', 271 'type': 'executable',
270 'sources': [ 272 'sources': [
271 '../tools/skpinfo.cpp', 273 '../tools/skpinfo.cpp',
272 ], 274 ],
273 'include_dirs': [ 275 'include_dirs': [
276 '../include/private',
274 '../src/core/', 277 '../src/core/',
275 ], 278 ],
276 'dependencies': [ 279 'dependencies': [
277 'flags.gyp:flags', 280 'flags.gyp:flags',
278 'skia_lib.gyp:skia_lib', 281 'skia_lib.gyp:skia_lib',
279 ], 282 ],
280 }, 283 },
281 { 284 {
282 'target_name': 'flatten', 285 'target_name': 'flatten',
283 'type': 'executable', 286 'type': 'executable',
284 'sources': [ 287 'sources': [
285 '../tools/flatten.cpp', 288 '../tools/flatten.cpp',
286 ], 289 ],
287 'dependencies': [ 290 'dependencies': [
288 'skia_lib.gyp:skia_lib', 291 'skia_lib.gyp:skia_lib',
289 ], 292 ],
290 }, 293 },
291 { 294 {
292 # Superseded by dm, should be removed. 295 # Superseded by dm, should be removed.
293 'target_name': 'skp2svg', 296 'target_name': 'skp2svg',
294 'type': 'executable', 297 'type': 'executable',
295 'sources': [ 298 'sources': [
296 '../src/svg/skp2svg.cpp', 299 '../src/svg/skp2svg.cpp',
297 '../tools/LazyDecodeBitmap.cpp', 300 '../tools/LazyDecodeBitmap.cpp',
298 ], 301 ],
299 'include_dirs': [ 302 'include_dirs': [
303 '../include/private',
300 '../src/core/', 304 '../src/core/',
301 '../src/lazy/', 305 '../src/lazy/',
302 '../tools/', 306 '../tools/',
303 ], 307 ],
304 'dependencies': [ 308 'dependencies': [
305 'flags.gyp:flags', 309 'flags.gyp:flags',
306 'skia_lib.gyp:skia_lib', 310 'skia_lib.gyp:skia_lib',
307 'svg.gyp:svg', 311 'svg.gyp:svg',
308 'xml.gyp:xml', 312 'xml.gyp:xml',
309 ], 313 ],
310 }, 314 },
311 { 315 {
312 'target_name': 'gpuveto', 316 'target_name': 'gpuveto',
313 'type': 'executable', 317 'type': 'executable',
314 'sources': [ 318 'sources': [
315 '../tools/gpuveto.cpp', 319 '../tools/gpuveto.cpp',
316 '../tools/LazyDecodeBitmap.cpp', 320 '../tools/LazyDecodeBitmap.cpp',
317 ], 321 ],
318 'include_dirs': [ 322 'include_dirs': [
323 '../include/private',
319 '../src/core/', 324 '../src/core/',
320 '../src/images', 325 '../src/images',
321 '../src/lazy', 326 '../src/lazy',
322 ], 327 ],
323 'dependencies': [ 328 'dependencies': [
324 'flags.gyp:flags', 329 'flags.gyp:flags',
325 'skia_lib.gyp:skia_lib', 330 'skia_lib.gyp:skia_lib',
326 ], 331 ],
327 }, 332 },
328 { 333 {
329 'target_name': 'lua_app', 334 'target_name': 'lua_app',
330 'type': 'executable', 335 'type': 'executable',
331 'sources': [ 336 'sources': [
332 '../tools/lua/lua_app.cpp', 337 '../tools/lua/lua_app.cpp',
333 '../src/utils/SkLua.cpp', 338 '../src/utils/SkLua.cpp',
334 ], 339 ],
335 'include_dirs': [ 340 'include_dirs': [
341 '../include/private',
336 # Lua exposes GrReduceClip which in turn requires src/core for SkTLList 342 # Lua exposes GrReduceClip which in turn requires src/core for SkTLList
337 '../src/gpu/', 343 '../src/gpu/',
338 '../src/core/', 344 '../src/core/',
339 ], 345 ],
340 'dependencies': [ 346 'dependencies': [
341 'effects.gyp:effects', 347 'effects.gyp:effects',
342 'images.gyp:images', 348 'images.gyp:images',
343 'lua.gyp:lua', 349 'lua.gyp:lua',
344 'pdf.gyp:pdf', 350 'pdf.gyp:pdf',
345 'ports.gyp:ports', 351 'ports.gyp:ports',
346 'skia_lib.gyp:skia_lib', 352 'skia_lib.gyp:skia_lib',
347 ], 353 ],
348 }, 354 },
349 { 355 {
350 'target_name': 'lua_pictures', 356 'target_name': 'lua_pictures',
351 'type': 'executable', 357 'type': 'executable',
352 'sources': [ 358 'sources': [
353 '../tools/lua/lua_pictures.cpp', 359 '../tools/lua/lua_pictures.cpp',
354 '../src/utils/SkLuaCanvas.cpp', 360 '../src/utils/SkLuaCanvas.cpp',
355 '../src/utils/SkLua.cpp', 361 '../src/utils/SkLua.cpp',
356 ], 362 ],
357 'include_dirs': [ 363 'include_dirs': [
364 '../include/private',
358 # Lua exposes GrReduceClip which in turn requires src/core for SkTLList 365 # Lua exposes GrReduceClip which in turn requires src/core for SkTLList
359 '../src/gpu/', 366 '../src/gpu/',
360 '../src/core/', 367 '../src/core/',
361 ], 368 ],
362 'dependencies': [ 369 'dependencies': [
363 'effects.gyp:effects', 370 'effects.gyp:effects',
364 'flags.gyp:flags', 371 'flags.gyp:flags',
365 'images.gyp:images', 372 'images.gyp:images',
366 'lua.gyp:lua', 373 'lua.gyp:lua',
367 'tools.gyp:picture_renderer', 374 'tools.gyp:picture_renderer',
368 'tools.gyp:picture_utils', 375 'tools.gyp:picture_utils',
369 'pdf.gyp:pdf', 376 'pdf.gyp:pdf',
370 'ports.gyp:ports', 377 'ports.gyp:ports',
371 'skia_lib.gyp:skia_lib', 378 'skia_lib.gyp:skia_lib',
372 ], 379 ],
373 }, 380 },
374 { 381 {
375 'target_name': 'render_pictures', 382 'target_name': 'render_pictures',
376 'type': 'executable', 383 'type': 'executable',
377 'sources': [ 384 'sources': [
378 '../tools/render_pictures_main.cpp', 385 '../tools/render_pictures_main.cpp',
379 ], 386 ],
380 'include_dirs': [ 387 'include_dirs': [
388 '../include/private',
381 '../src/core', 389 '../src/core',
382 '../src/images', 390 '../src/images',
383 '../src/lazy', 391 '../src/lazy',
384 '../src/pipe/utils/', 392 '../src/pipe/utils/',
385 ], 393 ],
386 'dependencies': [ 394 'dependencies': [
387 'flags.gyp:flags', 395 'flags.gyp:flags',
388 'skia_lib.gyp:skia_lib', 396 'skia_lib.gyp:skia_lib',
389 'tools.gyp:picture_renderer', 397 'tools.gyp:picture_renderer',
390 'tools.gyp:picture_utils', 398 'tools.gyp:picture_utils',
391 ], 399 ],
392 }, 400 },
393 { 401 {
394 'target_name': 'bench_pictures', 402 'target_name': 'bench_pictures',
395 'type': 'executable', 403 'type': 'executable',
396 'sources': [ 404 'sources': [
397 '../bench/BenchLogger.cpp', 405 '../bench/BenchLogger.cpp',
398 '../bench/BenchLogger.h', 406 '../bench/BenchLogger.h',
399 '../tools/PictureBenchmark.cpp', 407 '../tools/PictureBenchmark.cpp',
400 '../tools/PictureResultsWriter.h', 408 '../tools/PictureResultsWriter.h',
401 '../tools/bench_pictures_main.cpp', 409 '../tools/bench_pictures_main.cpp',
402 ], 410 ],
403 'include_dirs': [ 411 'include_dirs': [
412 '../include/private',
404 '../src/core/', 413 '../src/core/',
405 '../bench', 414 '../bench',
406 '../src/lazy/', 415 '../src/lazy/',
407 ], 416 ],
408 'dependencies': [ 417 'dependencies': [
409 'timer', 418 'timer',
410 'crash_handler', 419 'crash_handler',
411 'flags.gyp:flags', 420 'flags.gyp:flags',
412 'jsoncpp.gyp:jsoncpp', 421 'jsoncpp.gyp:jsoncpp',
413 'skia_lib.gyp:skia_lib', 422 'skia_lib.gyp:skia_lib',
414 'tools.gyp:picture_renderer', 423 'tools.gyp:picture_renderer',
415 'tools.gyp:picture_utils', 424 'tools.gyp:picture_utils',
416 ], 425 ],
417 'conditions': [ 426 'conditions': [
418 ['skia_android_framework == 1', { 427 ['skia_android_framework == 1', {
419 'libraries': [ '-lskia' ], 428 'libraries': [ '-lskia' ],
420 }], 429 }],
421 ], 430 ],
422 }, 431 },
423 { 432 {
424 'target_name': 'dump_record', 433 'target_name': 'dump_record',
425 'type': 'executable', 434 'type': 'executable',
426 'sources': [ 435 'sources': [
427 '../tools/dump_record.cpp', 436 '../tools/dump_record.cpp',
428 '../tools/DumpRecord.cpp', 437 '../tools/DumpRecord.cpp',
429 '../tools/LazyDecodeBitmap.cpp', 438 '../tools/LazyDecodeBitmap.cpp',
430 ], 439 ],
431 'include_dirs': [ 440 'include_dirs': [
441 '../include/private',
432 '../src/core/', 442 '../src/core/',
433 '../src/images', 443 '../src/images',
434 '../src/lazy', 444 '../src/lazy',
435 ], 445 ],
436 'dependencies': [ 446 'dependencies': [
437 'timer', 447 'timer',
438 'flags.gyp:flags', 448 'flags.gyp:flags',
439 'skia_lib.gyp:skia_lib', 449 'skia_lib.gyp:skia_lib',
440 ], 450 ],
441 }, 451 },
442 { 452 {
443 'target_name': 'picture_renderer', 453 'target_name': 'picture_renderer',
444 'type': 'static_library', 454 'type': 'static_library',
445 'sources': [ 455 'sources': [
446 '../tools/image_expectations.h', 456 '../tools/image_expectations.h',
447 '../tools/image_expectations.cpp', 457 '../tools/image_expectations.cpp',
448 '../tools/LazyDecodeBitmap.cpp', 458 '../tools/LazyDecodeBitmap.cpp',
449 '../tools/PictureRenderer.h', 459 '../tools/PictureRenderer.h',
450 '../tools/PictureRenderer.cpp', 460 '../tools/PictureRenderer.cpp',
451 '../tools/PictureRenderingFlags.h', 461 '../tools/PictureRenderingFlags.h',
452 '../tools/PictureRenderingFlags.cpp', 462 '../tools/PictureRenderingFlags.cpp',
453 '../tools/CopyTilesRenderer.h', 463 '../tools/CopyTilesRenderer.h',
454 '../tools/CopyTilesRenderer.cpp', 464 '../tools/CopyTilesRenderer.cpp',
455 '../src/pipe/utils/SamplePipeControllers.h', 465 '../src/pipe/utils/SamplePipeControllers.h',
456 '../src/pipe/utils/SamplePipeControllers.cpp', 466 '../src/pipe/utils/SamplePipeControllers.cpp',
457 ], 467 ],
458 'include_dirs': [ 468 'include_dirs': [
469 '../include/private',
459 '../src/core', 470 '../src/core',
460 '../src/images', 471 '../src/images',
461 '../src/lazy', 472 '../src/lazy',
462 '../src/pipe/utils/', 473 '../src/pipe/utils/',
463 '../src/utils/', 474 '../src/utils/',
464 ], 475 ],
465 'direct_dependent_settings': { 476 'direct_dependent_settings': {
466 'include_dirs': [ 477 'include_dirs': [
467 # needed for JSON headers used within image_expectations.h 478 # needed for JSON headers used within image_expectations.h
468 '../third_party/externals/jsoncpp-chromium/overrides/include/', 479 '../third_party/externals/jsoncpp-chromium/overrides/include/',
(...skipping 22 matching lines...) Expand all
491 ], 502 ],
492 ], 503 ],
493 }, 504 },
494 { 505 {
495 'target_name': 'render_pdfs', 506 'target_name': 'render_pdfs',
496 'type': 'executable', 507 'type': 'executable',
497 'sources': [ 508 'sources': [
498 '../tools/render_pdfs_main.cpp', 509 '../tools/render_pdfs_main.cpp',
499 ], 510 ],
500 'include_dirs': [ 511 'include_dirs': [
512 '../include/private',
501 '../src/core', 513 '../src/core',
502 '../src/pipe/utils/', 514 '../src/pipe/utils/',
503 '../src/utils/', 515 '../src/utils/',
504 ], 516 ],
505 'dependencies': [ 517 'dependencies': [
506 'flags.gyp:flags', 518 'flags.gyp:flags',
507 'pdf.gyp:pdf', 519 'pdf.gyp:pdf',
508 'skia_lib.gyp:skia_lib', 520 'skia_lib.gyp:skia_lib',
509 'tools.gyp:picture_utils', 521 'tools.gyp:picture_utils',
510 'tools.gyp:proc_stats', 522 'tools.gyp:proc_stats',
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
581 ], 593 ],
582 'dependencies': [ 594 'dependencies': [
583 'flags.gyp:flags', 595 'flags.gyp:flags',
584 'skia_lib.gyp:skia_lib', 596 'skia_lib.gyp:skia_lib',
585 ], 597 ],
586 }, 598 },
587 { 599 {
588 'target_name': 'filter', 600 'target_name': 'filter',
589 'type': 'executable', 601 'type': 'executable',
590 'include_dirs' : [ 602 'include_dirs' : [
603 '../include/private',
591 '../src/core', 604 '../src/core',
592 '../src/utils/debugger', 605 '../src/utils/debugger',
593 ], 606 ],
594 'sources': [ 607 'sources': [
595 '../tools/filtermain.cpp', 608 '../tools/filtermain.cpp',
596 '../src/utils/debugger/SkDrawCommand.h', 609 '../src/utils/debugger/SkDrawCommand.h',
597 '../src/utils/debugger/SkDrawCommand.cpp', 610 '../src/utils/debugger/SkDrawCommand.cpp',
598 '../src/utils/debugger/SkDebugCanvas.h', 611 '../src/utils/debugger/SkDebugCanvas.h',
599 '../src/utils/debugger/SkDebugCanvas.cpp', 612 '../src/utils/debugger/SkDebugCanvas.cpp',
600 '../src/utils/debugger/SkObjectParser.h', 613 '../src/utils/debugger/SkObjectParser.h',
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
708 'target_name': 'sklua', 721 'target_name': 'sklua',
709 'product_name': 'skia', 722 'product_name': 'skia',
710 'product_prefix': '', 723 'product_prefix': '',
711 'product_dir': '<(PRODUCT_DIR)/', 724 'product_dir': '<(PRODUCT_DIR)/',
712 'type': 'shared_library', 725 'type': 'shared_library',
713 'sources': [ 726 'sources': [
714 '../src/utils/SkLuaCanvas.cpp', 727 '../src/utils/SkLuaCanvas.cpp',
715 '../src/utils/SkLua.cpp', 728 '../src/utils/SkLua.cpp',
716 ], 729 ],
717 'include_dirs': [ 730 'include_dirs': [
731 '../include/private',
718 # Lua exposes GrReduceClip which in turn requires src/core for SkT LList 732 # Lua exposes GrReduceClip which in turn requires src/core for SkT LList
719 '../src/gpu/', 733 '../src/gpu/',
720 '../src/core/', 734 '../src/core/',
721 '../third_party/lua/src/', 735 '../third_party/lua/src/',
722 ], 736 ],
723 'dependencies': [ 737 'dependencies': [
724 'lua.gyp:lua', 738 'lua.gyp:lua',
725 'pdf.gyp:pdf', 739 'pdf.gyp:pdf',
726 'skia_lib.gyp:skia_lib', 740 'skia_lib.gyp:skia_lib',
727 ], 741 ],
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
771 ['skia_os == "mac"', 785 ['skia_os == "mac"',
772 { 786 {
773 'targets': [ 787 'targets': [
774 { 788 {
775 'target_name': 'create_test_font', 789 'target_name': 'create_test_font',
776 'type': 'executable', 790 'type': 'executable',
777 'sources': [ 791 'sources': [
778 '../tools/create_test_font.cpp', 792 '../tools/create_test_font.cpp',
779 ], 793 ],
780 'include_dirs': [ 794 'include_dirs': [
795 '../include/private',
781 '../src/core', 796 '../src/core',
782 ], 797 ],
783 'dependencies': [ 798 'dependencies': [
784 'flags.gyp:flags', 799 'flags.gyp:flags',
785 'skia_lib.gyp:skia_lib', 800 'skia_lib.gyp:skia_lib',
786 'resources', 801 'resources',
787 ], 802 ],
788 }, 803 },
789 ], 804 ],
790 }, 805 },
791 ], 806 ],
792 ], 807 ],
793 } 808 }
OLDNEW
« no previous file with comments | « no previous file | gyp/utils.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698