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

Side by Side Diff: build/all.gyp

Issue 12035084: Remove CF from all.gyp targets if use_aura is defined. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 11 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 | Annotate | Revision Log
« 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) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 'targets': [ 6 'targets': [
7 { 7 {
8 'target_name': 'All', 8 'target_name': 'All',
9 'type': 'none', 9 'type': 'none',
10 'xcode_create_dependents_test_runner': 1, 10 'xcode_create_dependents_test_runner': 1,
(...skipping 225 matching lines...) Expand 10 before | Expand all | Expand 10 after
236 '../chrome_frame/chrome_frame.gyp:npchrome_frame', 236 '../chrome_frame/chrome_frame.gyp:npchrome_frame',
237 '../courgette/courgette.gyp:courgette_unittests', 237 '../courgette/courgette.gyp:courgette_unittests',
238 '../sandbox/sandbox.gyp:sbox_integration_tests', 238 '../sandbox/sandbox.gyp:sbox_integration_tests',
239 '../sandbox/sandbox.gyp:sbox_unittests', 239 '../sandbox/sandbox.gyp:sbox_unittests',
240 '../sandbox/sandbox.gyp:sbox_validation_tests', 240 '../sandbox/sandbox.gyp:sbox_validation_tests',
241 '../webkit/webkit.gyp:pull_in_copy_TestNetscapePlugIn', 241 '../webkit/webkit.gyp:pull_in_copy_TestNetscapePlugIn',
242 '../ui/app_list/app_list.gyp:app_list_unittests', 242 '../ui/app_list/app_list.gyp:app_list_unittests',
243 '../ui/views/views.gyp:views_unittests', 243 '../ui/views/views.gyp:views_unittests',
244 '../webkit/webkit.gyp:test_shell_common', 244 '../webkit/webkit.gyp:test_shell_common',
245 ], 245 ],
246 'conditions': [
247 ['use_aura==1', {
248 'dependencies!': [
249 '../chrome_frame/chrome_frame.gyp:npchrome_frame',
250 ],
251 'defines': [
252 'OMIT_CHROME_FRAME',
253 ],
254 }], # use_aura==1
255 ],
246 }], 256 }],
247 ['OS=="linux"', { 257 ['OS=="linux"', {
248 'dependencies': [ 258 'dependencies': [
249 '../sandbox/sandbox.gyp:sandbox_linux_unittests', 259 '../sandbox/sandbox.gyp:sandbox_linux_unittests',
250 ], 260 ],
251 }], 261 }],
252 ], 262 ],
253 }, # target_name: chromium_builder_tests 263 }, # target_name: chromium_builder_tests
254 { 264 {
255 'target_name': 'chromium_2010_builder_tests', 265 'target_name': 'chromium_2010_builder_tests',
(...skipping 279 matching lines...) Expand 10 before | Expand all | Expand 10 after
535 '../remoting/remoting.gyp:remoting_unittests', 545 '../remoting/remoting.gyp:remoting_unittests',
536 '../sql/sql.gyp:sql_unittests', 546 '../sql/sql.gyp:sql_unittests',
537 '../sync/sync.gyp:sync_unit_tests', 547 '../sync/sync.gyp:sync_unit_tests',
538 '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalid ation_unittests', 548 '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalid ation_unittests',
539 '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_uni ttests', 549 '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_uni ttests',
540 '../ui/views/views.gyp:views_unittests', 550 '../ui/views/views.gyp:views_unittests',
541 '../webkit/compositor_bindings/compositor_bindings_tests.gyp:webkit_ compositor_bindings_unittests', 551 '../webkit/compositor_bindings/compositor_bindings_tests.gyp:webkit_ compositor_bindings_unittests',
542 '../webkit/webkit.gyp:pull_in_copy_TestNetscapePlugIn', 552 '../webkit/webkit.gyp:pull_in_copy_TestNetscapePlugIn',
543 'temp_gyp/googleurl.gyp:googleurl_unittests', 553 'temp_gyp/googleurl.gyp:googleurl_unittests',
544 ], 554 ],
555 'conditions': [
556 ['use_aura==1', {
557 'dependencies!': [
558 '../chrome_frame/chrome_frame.gyp:npchrome_frame',
559 ],
560 'defines': [
561 'OMIT_CHROME_FRAME',
562 ],
563 }], # use_aura==1
564 ],
545 }, 565 },
546 { 566 {
547 'target_name': 'chromium_builder_win_cf', 567 'target_name': 'chromium_builder_win_cf',
548 'type': 'none', 568 'type': 'none',
549 'dependencies': [ 569 'dependencies': [
550 '../chrome_frame/chrome_frame.gyp:chrome_frame_net_tests', 570 '../chrome_frame/chrome_frame.gyp:chrome_frame_net_tests',
551 '../chrome_frame/chrome_frame.gyp:chrome_frame_perftests', 571 '../chrome_frame/chrome_frame.gyp:chrome_frame_perftests',
552 '../chrome_frame/chrome_frame.gyp:chrome_frame_reliability_tests', 572 '../chrome_frame/chrome_frame.gyp:chrome_frame_reliability_tests',
553 '../chrome_frame/chrome_frame.gyp:chrome_frame_tests', 573 '../chrome_frame/chrome_frame.gyp:chrome_frame_tests',
554 '../chrome_frame/chrome_frame.gyp:chrome_frame_unittests', 574 '../chrome_frame/chrome_frame.gyp:chrome_frame_unittests',
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
639 'dependencies': [ 659 'dependencies': [
640 '../pdf/pdf.gyp:pdf', 660 '../pdf/pdf.gyp:pdf',
641 ], 661 ],
642 }], # internal_pdf 662 }], # internal_pdf
643 ['component != "shared_library" and wix_exists == "True" and \ 663 ['component != "shared_library" and wix_exists == "True" and \
644 sas_dll_exists == "True"', { 664 sas_dll_exists == "True"', {
645 'dependencies': [ 665 'dependencies': [
646 '../remoting/remoting.gyp:remoting_host_installation', 666 '../remoting/remoting.gyp:remoting_host_installation',
647 ], 667 ],
648 }], # component != "shared_library" 668 }], # component != "shared_library"
669 ['use_aura==1', {
670 'dependencies!': [
671 '../chrome_frame/chrome_frame.gyp:npchrome_frame',
672 ],
673 'defines': [
674 'OMIT_CHROME_FRAME',
675 ],
676 }], # use_aura==1
649 ] 677 ]
650 }, 678 },
651 ], # targets 679 ], # targets
652 }], # branding=="Chrome" 680 }], # branding=="Chrome"
653 ], # conditions 681 ], # conditions
654 }], # OS="win" 682 }], # OS="win"
655 ['use_aura==1', { 683 ['use_aura==1', {
656 'targets': [ 684 'targets': [
657 { 685 {
658 'target_name': 'aura_builder', 686 'target_name': 'aura_builder',
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
737 '../chrome/chrome.gyp:browser_tests_run', 765 '../chrome/chrome.gyp:browser_tests_run',
738 '../chrome/chrome.gyp:sync_integration_tests_run', 766 '../chrome/chrome.gyp:sync_integration_tests_run',
739 '../chrome/chrome.gyp:unit_tests_run', 767 '../chrome/chrome.gyp:unit_tests_run',
740 '../net/net.gyp:net_unittests_run', 768 '../net/net.gyp:net_unittests_run',
741 ], 769 ],
742 }, # target_name: chromium_swarm_tests 770 }, # target_name: chromium_swarm_tests
743 ], 771 ],
744 }], 772 }],
745 ], # conditions 773 ], # conditions
746 } 774 }
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