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

Side by Side Diff: chrome/chrome_exe.gypi

Issue 1818423003: Revert of Remove configuration policy from chrome build files. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@policy_chrome_defines
Patch Set: Created 4 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
« no previous file with comments | « chrome/chrome_dll.gypi ('k') | chrome/chrome_process_finder.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 # GN version: //chrome 8 # GN version: //chrome
9 'target_name': 'chrome', 9 'target_name': 'chrome',
10 'type': 'none', 10 'type': 'none',
(...skipping 400 matching lines...) Expand 10 before | Expand all | Expand 10 after
411 'installer_util', 411 'installer_util',
412 'file_pre_reader', 412 'file_pre_reader',
413 '../base/base.gyp:base', 413 '../base/base.gyp:base',
414 '../crypto/crypto.gyp:crypto', 414 '../crypto/crypto.gyp:crypto',
415 '../breakpad/breakpad.gyp:breakpad_handler', 415 '../breakpad/breakpad.gyp:breakpad_handler',
416 '../breakpad/breakpad.gyp:breakpad_sender', 416 '../breakpad/breakpad.gyp:breakpad_sender',
417 '../chrome_elf/chrome_elf.gyp:chrome_elf', 417 '../chrome_elf/chrome_elf.gyp:chrome_elf',
418 '../components/components.gyp:crash_component', 418 '../components/components.gyp:crash_component',
419 '../components/components.gyp:crash_core_common', 419 '../components/components.gyp:crash_core_common',
420 '../components/components.gyp:flags_ui_switches', 420 '../components/components.gyp:flags_ui_switches',
421 '../components/components.gyp:policy',
422 '../components/components.gyp:startup_metric_utils_common', 421 '../components/components.gyp:startup_metric_utils_common',
423 '../sandbox/sandbox.gyp:sandbox', 422 '../sandbox/sandbox.gyp:sandbox',
424 '../third_party/kasko/kasko.gyp:kasko_features', 423 '../third_party/kasko/kasko.gyp:kasko_features',
425 '../ui/gfx/gfx.gyp:gfx', 424 '../ui/gfx/gfx.gyp:gfx',
426 '../win8/win8.gyp:visual_elements_resources', 425 '../win8/win8.gyp:visual_elements_resources',
427 ], 426 ],
428 'sources': [ 427 'sources': [
429 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/chrome_exe_version.rc', 428 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/chrome_exe_version.rc',
430 'app/chrome_exe.rc', 429 'app/chrome_exe.rc',
431 'common/crash_keys.cc', 430 'common/crash_keys.cc',
(...skipping 21 matching lines...) Expand all
453 }], 452 }],
454 ], 453 ],
455 }, 454 },
456 'VCManifestTool': { 455 'VCManifestTool': {
457 'AdditionalManifestFiles': [ 456 'AdditionalManifestFiles': [
458 '$(ProjectDir)\\app\\chrome.exe.manifest', 457 '$(ProjectDir)\\app\\chrome.exe.manifest',
459 '<(SHARED_INTERMEDIATE_DIR)/chrome/app/version_assembly/version_ assembly.manifest', 458 '<(SHARED_INTERMEDIATE_DIR)/chrome/app/version_assembly/version_ assembly.manifest',
460 ], 459 ],
461 }, 460 },
462 }, 461 },
462 'conditions': [
463 ['configuration_policy==1', {
464 'dependencies': [
465 '<(DEPTH)/components/components.gyp:policy',
466 ],
467 }],
468 ],
463 'actions': [ 469 'actions': [
464 { 470 {
465 'action_name': 'first_run', 471 'action_name': 'first_run',
466 'inputs': [ 472 'inputs': [
467 'app/FirstRun', 473 'app/FirstRun',
468 ], 474 ],
469 'outputs': [ 475 'outputs': [
470 '<(PRODUCT_DIR)/First Run', 476 '<(PRODUCT_DIR)/First Run',
471 ], 477 ],
472 'action': ['python', '../build/cp.py', '<@(_inputs)', '<@(_outputs )'], 478 'action': ['python', '../build/cp.py', '<@(_inputs)', '<@(_outputs )'],
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
533 'installer_util_nacl_win64', 539 'installer_util_nacl_win64',
534 '../base/base.gyp:base_i18n_nacl_win64', 540 '../base/base.gyp:base_i18n_nacl_win64',
535 '../base/base.gyp:base_win64', 541 '../base/base.gyp:base_win64',
536 '../base/base.gyp:base_static_win64', 542 '../base/base.gyp:base_static_win64',
537 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp :dynamic_annotations_win64', 543 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp :dynamic_annotations_win64',
538 '../breakpad/breakpad.gyp:breakpad_handler_win64', 544 '../breakpad/breakpad.gyp:breakpad_handler_win64',
539 '../breakpad/breakpad.gyp:breakpad_sender_win64', 545 '../breakpad/breakpad.gyp:breakpad_sender_win64',
540 '../components/components.gyp:breakpad_win64', 546 '../components/components.gyp:breakpad_win64',
541 '../components/components.gyp:crash_core_common_win64', 547 '../components/components.gyp:crash_core_common_win64',
542 '../components/components.gyp:flags_ui_switches_win64', 548 '../components/components.gyp:flags_ui_switches_win64',
543 '../components/components.gyp:policy_win64',
544 '../chrome/common_constants.gyp:common_constants_win64', 549 '../chrome/common_constants.gyp:common_constants_win64',
545 '../components/nacl.gyp:nacl_win64', 550 '../components/nacl.gyp:nacl_win64',
546 '../crypto/crypto.gyp:crypto_nacl_win64', 551 '../crypto/crypto.gyp:crypto_nacl_win64',
547 '../ipc/ipc.gyp:ipc_win64', 552 '../ipc/ipc.gyp:ipc_win64',
548 '../sandbox/sandbox.gyp:sandbox_win64', 553 '../sandbox/sandbox.gyp:sandbox_win64',
549 '../third_party/kasko/kasko.gyp:kasko_features', 554 '../third_party/kasko/kasko.gyp:kasko_features',
550 ], 555 ],
551 'defines': [ 556 'defines': [
552 '<@(nacl_win64_defines)', 557 '<@(nacl_win64_defines)',
553 'COMPILE_CONTENT_STATICALLY', 558 'COMPILE_CONTENT_STATICALLY',
554 ], 559 ],
555 'include_dirs': [ 560 'include_dirs': [
556 '<(SHARED_INTERMEDIATE_DIR)/chrome', 561 '<(SHARED_INTERMEDIATE_DIR)/chrome',
557 ], 562 ],
558 'msvs_settings': { 563 'msvs_settings': {
559 'VCLinkerTool': { 564 'VCLinkerTool': {
560 'ImportLibrary': '$(OutDir)\\lib\\nacl64_exe.lib', 565 'ImportLibrary': '$(OutDir)\\lib\\nacl64_exe.lib',
561 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS 566 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS
562 }, 567 },
563 }, 568 },
564 'configurations': { 569 'configurations': {
565 'Common_Base': { 570 'Common_Base': {
566 'msvs_target_platform': 'x64', 571 'msvs_target_platform': 'x64',
567 }, 572 },
568 }, 573 },
574 'conditions': [
575 ['configuration_policy==1', {
576 'dependencies': [
577 '<(DEPTH)/components/components.gyp:policy_win64',
578 ],
579 }],
580 ],
569 }, 581 },
570 ], 582 ],
571 }, { # else (disable_nacl==1) 583 }, { # else (disable_nacl==1)
572 'targets': [ 584 'targets': [
573 { 585 {
574 'target_name': 'chrome_nacl_win64', 586 'target_name': 'chrome_nacl_win64',
575 'type': 'none', 587 'type': 'none',
576 'sources': [], 588 'sources': [],
577 }, 589 },
578 ], 590 ],
(...skipping 21 matching lines...) Expand all
600 'dependencies': [ 612 'dependencies': [
601 'chrome_nacl_win64', 613 'chrome_nacl_win64',
602 ], 614 ],
603 }], 615 }],
604 ], 616 ],
605 }, 617 },
606 ], 618 ],
607 }], 619 }],
608 ], 620 ],
609 } 621 }
OLDNEW
« no previous file with comments | « chrome/chrome_dll.gypi ('k') | chrome/chrome_process_finder.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698