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

Side by Side Diff: chrome/chrome_exe.gypi

Issue 8570024: Enable content component (again!). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: tweak audio exports Created 9 years, 1 month 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 | « build/common.gypi ('k') | chrome/chrome_installer_util.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 (c) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 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': 'chrome', 8 'target_name': 'chrome',
9 'type': 'executable', 9 'type': 'executable',
10 'mac_bundle': 1, 10 'mac_bundle': 1,
(...skipping 477 matching lines...) Expand 10 before | Expand all | Expand 10 after
488 ], 488 ],
489 'action': ['cp', '-f', '<@(_inputs)', '<@(_outputs)'], 489 'action': ['cp', '-f', '<@(_inputs)', '<@(_outputs)'],
490 'message': 'Copy first run complete sentinel file', 490 'message': 'Copy first run complete sentinel file',
491 }, 491 },
492 ], 492 ],
493 }, { # 'OS!="win" 493 }, { # 'OS!="win"
494 'sources!': [ 494 'sources!': [
495 'app/client_util.cc', 495 'app/client_util.cc',
496 ], 496 ],
497 }], 497 }],
498 ['OS=="win" and component=="shared_library"', {
499 'defines': ['COMPILE_CONTENT_STATICALLY'],
500 }]
498 ], 501 ],
499 }, 502 },
500 ], 503 ],
501 'conditions': [ 504 'conditions': [
502 ['OS=="win"', { 505 ['OS=="win"', {
503 'targets': [ 506 'targets': [
504 { 507 {
505 'target_name': 'chrome_nacl_win64', 508 'target_name': 'chrome_nacl_win64',
506 'type': 'executable', 509 'type': 'executable',
507 'product_name': 'nacl64', 510 'product_name': 'nacl64',
(...skipping 19 matching lines...) Expand all
527 '../breakpad/breakpad.gyp:breakpad_sender_win64', 530 '../breakpad/breakpad.gyp:breakpad_sender_win64',
528 '../base/base.gyp:base_i18n_nacl_win64', 531 '../base/base.gyp:base_i18n_nacl_win64',
529 '../base/base.gyp:base_nacl_win64', 532 '../base/base.gyp:base_nacl_win64',
530 '../base/base.gyp:base_static_win64', 533 '../base/base.gyp:base_static_win64',
531 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dyn amic_annotations_win64', 534 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dyn amic_annotations_win64',
532 '../ipc/ipc.gyp:ipc_win64', 535 '../ipc/ipc.gyp:ipc_win64',
533 '../sandbox/sandbox.gyp:sandbox_win64', 536 '../sandbox/sandbox.gyp:sandbox_win64',
534 ], 537 ],
535 'defines': [ 538 'defines': [
536 '<@(nacl_win64_defines)', 539 '<@(nacl_win64_defines)',
540 'COMPILE_CONTENT_STATICALLY',
537 ], 541 ],
538 'include_dirs': [ 542 'include_dirs': [
539 '<(SHARED_INTERMEDIATE_DIR)/chrome', 543 '<(SHARED_INTERMEDIATE_DIR)/chrome',
540 ], 544 ],
541 'msvs_settings': { 545 'msvs_settings': {
542 'VCLinkerTool': { 546 'VCLinkerTool': {
543 'ImportLibrary': '$(OutDir)\\lib\\nacl64_exe.lib', 547 'ImportLibrary': '$(OutDir)\\lib\\nacl64_exe.lib',
544 'ProgramDatabaseFile': '$(OutDir)\\nacl64_exe.pdb', 548 'ProgramDatabaseFile': '$(OutDir)\\nacl64_exe.pdb',
545 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS 549 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS
546 }, 550 },
547 }, 551 },
548 'configurations': { 552 'configurations': {
549 'Common_Base': { 553 'Common_Base': {
550 'msvs_target_platform': 'x64', 554 'msvs_target_platform': 'x64',
551 }, 555 },
552 }, 556 },
553 }, 557 },
554 ], 558 ],
555 }], 559 }],
556 ], 560 ],
557 } 561 }
OLDNEW
« no previous file with comments | « build/common.gypi ('k') | chrome/chrome_installer_util.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698