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

Side by Side Diff: chrome/chrome_exe.gypi

Issue 21020004: Move nacl.gypi to components. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix oreder Created 7 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 | chrome/chrome_renderer.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) 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': 'chrome', 8 'target_name': 'chrome',
9 'type': 'executable', 9 'type': 'executable',
10 'mac_bundle': 1, 10 'mac_bundle': 1,
(...skipping 553 matching lines...) Expand 10 before | Expand all | Expand 10 after
564 '../content/app/startup_helper_win.cc', 564 '../content/app/startup_helper_win.cc',
565 '../content/common/sandbox_init_win.cc', 565 '../content/common/sandbox_init_win.cc',
566 '../content/common/sandbox_win.cc', 566 '../content/common/sandbox_win.cc',
567 '../content/public/common/content_switches.cc', 567 '../content/public/common/content_switches.cc',
568 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/nacl64_exe_version.rc ', 568 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/nacl64_exe_version.rc ',
569 ], 569 ],
570 'dependencies': [ 570 'dependencies': [
571 'app/policy/cloud_policy_codegen.gyp:policy_win64', 571 'app/policy/cloud_policy_codegen.gyp:policy_win64',
572 'chrome_version_resources', 572 'chrome_version_resources',
573 'installer_util_nacl_win64', 573 'installer_util_nacl_win64',
574 'nacl_win64',
575 '../breakpad/breakpad.gyp:breakpad_handler_win64', 574 '../breakpad/breakpad.gyp:breakpad_handler_win64',
576 '../breakpad/breakpad.gyp:breakpad_sender_win64', 575 '../breakpad/breakpad.gyp:breakpad_sender_win64',
577 '../base/base.gyp:base_i18n_nacl_win64', 576 '../base/base.gyp:base_i18n_nacl_win64',
578 '../base/base.gyp:base_nacl_win64', 577 '../base/base.gyp:base_nacl_win64',
579 '../base/base.gyp:base_static_win64', 578 '../base/base.gyp:base_static_win64',
580 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp :dynamic_annotations_win64', 579 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp :dynamic_annotations_win64',
581 '../components/components.gyp:breakpad_win64', 580 '../components/components.gyp:breakpad_win64',
582 '../chrome/common_constants.gyp:common_constants_win64', 581 '../chrome/common_constants.gyp:common_constants_win64',
582 '../components/nacl.gyp:nacl_win64',
583 '../crypto/crypto.gyp:crypto_nacl_win64', 583 '../crypto/crypto.gyp:crypto_nacl_win64',
584 '../ipc/ipc.gyp:ipc_win64', 584 '../ipc/ipc.gyp:ipc_win64',
585 '../sandbox/sandbox.gyp:sandbox_win64', 585 '../sandbox/sandbox.gyp:sandbox_win64',
586 ], 586 ],
587 'defines': [ 587 'defines': [
588 '<@(nacl_win64_defines)', 588 '<@(nacl_win64_defines)',
589 'COMPILE_CONTENT_STATICALLY', 589 'COMPILE_CONTENT_STATICALLY',
590 ], 590 ],
591 'include_dirs': [ 591 'include_dirs': [
592 '<(SHARED_INTERMEDIATE_DIR)/chrome', 592 '<(SHARED_INTERMEDIATE_DIR)/chrome',
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
635 'dependencies': [ 635 'dependencies': [
636 'chrome_nacl_win64', 636 'chrome_nacl_win64',
637 ], 637 ],
638 }], 638 }],
639 ], 639 ],
640 }, 640 },
641 ], 641 ],
642 }], 642 }],
643 ], 643 ],
644 } 644 }
OLDNEW
« no previous file with comments | « no previous file | chrome/chrome_renderer.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698