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

Side by Side Diff: build/all.gyp

Issue 12220101: Minimal Chrome Frame with Aura. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: revert install_worker.cc to un-break win64 build Created 7 years, 9 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 | chrome/browser/automation/automation_provider.h » ('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 (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 240 matching lines...) Expand 10 before | Expand all | Expand 10 after
251 ], 251 ],
252 'conditions': [ 252 'conditions': [
253 ['target_arch!="x64"', { 253 ['target_arch!="x64"', {
254 'dependencies': [ 254 'dependencies': [
255 '../chrome_frame/chrome_frame.gyp:chrome_frame_net_tests', 255 '../chrome_frame/chrome_frame.gyp:chrome_frame_net_tests',
256 '../chrome_frame/chrome_frame.gyp:chrome_frame_perftests', 256 '../chrome_frame/chrome_frame.gyp:chrome_frame_perftests',
257 '../chrome_frame/chrome_frame.gyp:chrome_frame_reliability_test s', 257 '../chrome_frame/chrome_frame.gyp:chrome_frame_reliability_test s',
258 '../chrome_frame/chrome_frame.gyp:chrome_frame_tests', 258 '../chrome_frame/chrome_frame.gyp:chrome_frame_tests',
259 '../chrome_frame/chrome_frame.gyp:chrome_frame_unittests', 259 '../chrome_frame/chrome_frame.gyp:chrome_frame_unittests',
260 ] 260 ]
261 }], # target_arch!="x64" 261 }, { # target_arch!="x64"
262 ['use_aura==1 or target_arch=="x64"', {
263 'dependencies!': [ 262 'dependencies!': [
264 '../chrome_frame/chrome_frame.gyp:npchrome_frame', 263 '../chrome_frame/chrome_frame.gyp:npchrome_frame',
265 ], 264 ],
266 'defines': [ 265 'defines': [
267 'OMIT_CHROME_FRAME', 266 'OMIT_CHROME_FRAME',
268 ], 267 ],
269 }], # use_aura==1 or target_arch=="x64" 268 }], # target_arch=="x64"
270 ], 269 ],
271 }], 270 }],
272 ['OS=="linux"', { 271 ['OS=="linux"', {
273 'dependencies': [ 272 'dependencies': [
274 '../sandbox/sandbox.gyp:sandbox_linux_unittests', 273 '../sandbox/sandbox.gyp:sandbox_linux_unittests',
275 ], 274 ],
276 }], 275 }],
277 ], 276 ],
278 }, # target_name: chromium_builder_tests 277 }, # target_name: chromium_builder_tests
279 { 278 {
(...skipping 292 matching lines...) Expand 10 before | Expand all | Expand 10 after
572 ], 571 ],
573 'conditions': [ 572 'conditions': [
574 ['target_arch!="x64"', { 573 ['target_arch!="x64"', {
575 'dependencies': [ 574 'dependencies': [
576 '../chrome_frame/chrome_frame.gyp:chrome_frame_net_tests', 575 '../chrome_frame/chrome_frame.gyp:chrome_frame_net_tests',
577 '../chrome_frame/chrome_frame.gyp:chrome_frame_perftests', 576 '../chrome_frame/chrome_frame.gyp:chrome_frame_perftests',
578 '../chrome_frame/chrome_frame.gyp:chrome_frame_reliability_test s', 577 '../chrome_frame/chrome_frame.gyp:chrome_frame_reliability_test s',
579 '../chrome_frame/chrome_frame.gyp:chrome_frame_tests', 578 '../chrome_frame/chrome_frame.gyp:chrome_frame_tests',
580 '../chrome_frame/chrome_frame.gyp:chrome_frame_unittests', 579 '../chrome_frame/chrome_frame.gyp:chrome_frame_unittests',
581 ] 580 ]
582 }], # target_arch!="x64" 581 }, { # target_arch!="x64"
583 ['use_aura==1 or target_arch=="x64"', {
584 'dependencies!': [ 582 'dependencies!': [
585 '../chrome_frame/chrome_frame.gyp:npchrome_frame', 583 '../chrome_frame/chrome_frame.gyp:npchrome_frame',
586 ], 584 ],
587 'defines': [ 585 'defines': [
588 'OMIT_CHROME_FRAME', 586 'OMIT_CHROME_FRAME',
589 ], 587 ],
590 }], # use_aura==1 or target_arch=="x64" 588 }], # target_arch=="x64"
591 ], 589 ],
592 }, 590 },
593 { 591 {
594 'target_name': 'chromium_builder_win_cf', 592 'target_name': 'chromium_builder_win_cf',
595 'type': 'none', 593 'type': 'none',
596 'conditions': [ 594 'conditions': [
597 ['target_arch!="x64"', { 595 ['target_arch!="x64"', {
598 'dependencies': [ 596 'dependencies': [
599 '../chrome_frame/chrome_frame.gyp:chrome_frame_net_tests', 597 '../chrome_frame/chrome_frame.gyp:chrome_frame_net_tests',
600 '../chrome_frame/chrome_frame.gyp:chrome_frame_perftests', 598 '../chrome_frame/chrome_frame.gyp:chrome_frame_perftests',
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
699 '../chrome/chrome.gyp:crash_service_win64', 697 '../chrome/chrome.gyp:crash_service_win64',
700 '../courgette/courgette.gyp:courgette64', 698 '../courgette/courgette.gyp:courgette64',
701 ], 699 ],
702 }], 700 }],
703 ['component != "shared_library" and wix_exists == "True" and \ 701 ['component != "shared_library" and wix_exists == "True" and \
704 sas_dll_exists == "True"', { 702 sas_dll_exists == "True"', {
705 'dependencies': [ 703 'dependencies': [
706 '../remoting/remoting.gyp:remoting_host_installation', 704 '../remoting/remoting.gyp:remoting_host_installation',
707 ], 705 ],
708 }], # component != "shared_library" 706 }], # component != "shared_library"
709 ['use_aura==1 or target_arch=="x64"', { 707 ['target_arch=="x64"', {
710 'dependencies!': [ 708 'dependencies!': [
711 '../chrome_frame/chrome_frame.gyp:npchrome_frame', 709 '../chrome_frame/chrome_frame.gyp:npchrome_frame',
712 ], 710 ],
713 'defines': [ 711 'defines': [
714 'OMIT_CHROME_FRAME', 712 'OMIT_CHROME_FRAME',
715 ], 713 ],
716 }], # use_aura==1 or target_arch=="x64" 714 }], # target_arch=="x64"
717 ] 715 ]
718 }, 716 },
719 ], # targets 717 ], # targets
720 }], # branding=="Chrome" 718 }], # branding=="Chrome"
721 ], # conditions 719 ], # conditions
722 }], # OS="win" 720 }], # OS="win"
723 ['use_aura==1', { 721 ['use_aura==1', {
724 'targets': [ 722 'targets': [
725 { 723 {
726 'target_name': 'aura_builder', 724 'target_name': 'aura_builder',
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
802 '../chrome/chrome.gyp:browser_tests_run', 800 '../chrome/chrome.gyp:browser_tests_run',
803 '../chrome/chrome.gyp:sync_integration_tests_run', 801 '../chrome/chrome.gyp:sync_integration_tests_run',
804 '../chrome/chrome.gyp:unit_tests_run', 802 '../chrome/chrome.gyp:unit_tests_run',
805 '../net/net.gyp:net_unittests_run', 803 '../net/net.gyp:net_unittests_run',
806 ], 804 ],
807 }, # target_name: chromium_swarm_tests 805 }, # target_name: chromium_swarm_tests
808 ], 806 ],
809 }], 807 }],
810 ], # conditions 808 ], # conditions
811 } 809 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/automation/automation_provider.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698