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

Side by Side Diff: ui/gfx/gfx.gyp

Issue 1236863006: Generated header files apparently require hard_dependency (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 5 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 | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2013 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 }, 8 },
9 'targets': [ 9 'targets': [
10 { 10 {
(...skipping 396 matching lines...) Expand 10 before | Expand all | Expand 10 after
407 ], 407 ],
408 }, { # desktop platforms 408 }, { # desktop platforms
409 'variables': { 409 'variables': {
410 'vector_icons_cc_file': '<(INTERMEDIATE_DIR)/ui/gfx/vector_icons.cc' , 410 'vector_icons_cc_file': '<(INTERMEDIATE_DIR)/ui/gfx/vector_icons.cc' ,
411 'vector_icons_public_h_file': '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/vec tor_icons_public.h', 411 'vector_icons_public_h_file': '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/vec tor_icons_public.h',
412 }, 412 },
413 'include_dirs': [ 413 'include_dirs': [
414 '<(SHARED_INTERMEDIATE_DIR)>', 414 '<(SHARED_INTERMEDIATE_DIR)>',
415 ], 415 ],
416 'sources': [ 416 'sources': [
417 '<(vector_icons_cc_file)', 417 '<(vector_icons_cc_file)',
Nico 2015/07/13 19:05:55 I think if you set process_outputs_as_sourceson th
Evan Stade 2015/07/13 19:18:40 Done.
418 '<(vector_icons_public_h_file)', 418 '<(vector_icons_public_h_file)',
419 419
420 'paint_vector_icon.cc', 420 'paint_vector_icon.cc',
421 'paint_vector_icon.h', 421 'paint_vector_icon.h',
422 'vector_icons.h', 422 'vector_icons.h',
423 ], 423 ],
424 'actions': [ 424 'actions': [
425 { 425 {
426 # GN version: //ui/gfx:aggregate_vector_icons 426 # GN version: //ui/gfx:aggregate_vector_icons
427 'action_name': 'aggregate_vector_icons', 427 'action_name': 'aggregate_vector_icons',
428 'inputs': [ 428 'inputs': [
429 'vector_icons/', 429 'vector_icons/',
430 ], 430 ],
431 'outputs': [ 431 'outputs': [
432 '<(vector_icons_cc_file)', 432 '<(vector_icons_cc_file)',
433 '<(vector_icons_public_h_file)', 433 '<(vector_icons_public_h_file)',
434 ], 434 ],
435 'action': [ 'python', 435 'action': [ 'python',
436 'vector_icons/aggregate_vector_icons.py', 436 'vector_icons/aggregate_vector_icons.py',
437 '--working_directory=vector_icons/', 437 '--working_directory=vector_icons/',
438 '--output_cc=<(vector_icons_cc_file)', 438 '--output_cc=<(vector_icons_cc_file)',
439 '--output_h=<(vector_icons_public_h_file)', 439 '--output_h=<(vector_icons_public_h_file)',
440 ], 440 ],
441 'message': 'Aggregating vector resources.', 441 'message': 'Aggregating vector resources.',
442 }, 442 },
443 ], 443 ],
444 # Export a hard dependency because of generated header files.
445 'hard_dependency': 1,
Nico 2015/07/13 19:05:55 can you make a dedicated target for the generated
Evan Stade 2015/07/13 19:18:40 done
444 }], 446 }],
445 ['use_x11==1', { 447 ['use_x11==1', {
446 'dependencies': [ 448 'dependencies': [
447 '../../build/linux/system.gyp:x11', 449 '../../build/linux/system.gyp:x11',
448 'x/gfx_x11.gyp:gfx_x11', 450 'x/gfx_x11.gyp:gfx_x11',
449 ], 451 ],
450 }], 452 }],
451 ['use_cairo==1', { 453 ['use_cairo==1', {
452 'dependencies': [ 454 'dependencies': [
453 '<(DEPTH)/build/linux/system.gyp:pangocairo', 455 '<(DEPTH)/build/linux/system.gyp:pangocairo',
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
525 ], 527 ],
526 'variables': { 528 'variables': {
527 'jni_gen_package': 'ui/gfx', 529 'jni_gen_package': 'ui/gfx',
528 }, 530 },
529 'includes': [ '../../build/jni_generator.gypi' ], 531 'includes': [ '../../build/jni_generator.gypi' ],
530 }, 532 },
531 ], 533 ],
532 }], 534 }],
533 ], 535 ],
534 } 536 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698