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

Side by Side Diff: chrome/chrome_exe.gypi

Issue 2067018: Break gyp cycles on Linux. (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: remove duplicate vars Created 10 years, 7 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_installer.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) 2009-2010 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2009-2010 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 'target_defaults': { 6 'target_defaults': {
7 'variables': { 7 'variables': {
8 'chrome_exe_target': 0, 8 'chrome_exe_target': 0,
9 }, 9 },
10 'target_conditions': [ 10 'target_conditions': [
(...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after
183 ], 183 ],
184 ], 184 ],
185 'dependencies': [ 185 'dependencies': [
186 # On Linux, link the dependencies (libraries) that make up actual 186 # On Linux, link the dependencies (libraries) that make up actual
187 # Chromium functionality directly into the executable. 187 # Chromium functionality directly into the executable.
188 '<@(chromium_dependencies)', 188 '<@(chromium_dependencies)',
189 # Needed for chrome_dll_main.cc #include of gtk/gtk.h 189 # Needed for chrome_dll_main.cc #include of gtk/gtk.h
190 '../build/linux/system.gyp:gtk', 190 '../build/linux/system.gyp:gtk',
191 'packed_resources', 191 'packed_resources',
192 # Needed to use the master_preferences functions 192 # Needed to use the master_preferences functions
193 'installer/installer.gyp:installer_util', 193 'installer_util',
194 ], 194 ],
195 'sources': [ 195 'sources': [
196 'app/chrome_dll_main.cc', 196 'app/chrome_dll_main.cc',
197 'app/chrome_dll_resource.h', 197 'app/chrome_dll_resource.h',
198 ], 198 ],
199 'copies': [ 199 'copies': [
200 { 200 {
201 'destination': '<(PRODUCT_DIR)', 201 'destination': '<(PRODUCT_DIR)',
202 'files': ['tools/build/linux/chrome-wrapper', 202 'files': ['tools/build/linux/chrome-wrapper',
203 '../third_party/xdg-utils/scripts/xdg-settings', 203 '../third_party/xdg-utils/scripts/xdg-settings',
(...skipping 222 matching lines...) Expand 10 before | Expand all | Expand 10 after
426 'tools/build/mac/clean_up_old_versions', 426 'tools/build/mac/clean_up_old_versions',
427 '<(version_full)' 427 '<(version_full)'
428 ], 428 ],
429 }, 429 },
430 ], # postbuilds 430 ], # postbuilds
431 }], 431 }],
432 ['OS=="linux"', { 432 ['OS=="linux"', {
433 'conditions': [ 433 'conditions': [
434 ['branding=="Chrome"', { 434 ['branding=="Chrome"', {
435 'dependencies': [ 435 'dependencies': [
436 'installer/installer.gyp:linux_installer_configs', 436 'linux_installer_configs',
437 ], 437 ],
438 }], 438 }],
439 ['selinux==0', { 439 ['selinux==0', {
440 'dependencies': [ 440 'dependencies': [
441 '../sandbox/sandbox.gyp:sandbox', 441 '../sandbox/sandbox.gyp:sandbox',
442 ], 442 ],
443 }], 443 }],
444 ['linux_sandbox_path != ""', { 444 ['linux_sandbox_path != ""', {
445 'defines': [ 445 'defines': [
446 'LINUX_SANDBOX_PATH="<(linux_sandbox_path)"', 446 'LINUX_SANDBOX_PATH="<(linux_sandbox_path)"',
(...skipping 19 matching lines...) Expand all
466 }], 466 }],
467 ['OS=="mac" or OS=="win"', { 467 ['OS=="mac" or OS=="win"', {
468 'dependencies': [ 468 'dependencies': [
469 # On Windows and Mac, make sure we've built chrome_dll, which 469 # On Windows and Mac, make sure we've built chrome_dll, which
470 # contains all of the library code with Chromium functionality. 470 # contains all of the library code with Chromium functionality.
471 'chrome_dll', 471 'chrome_dll',
472 ], 472 ],
473 }], 473 }],
474 ['OS=="win"', { 474 ['OS=="win"', {
475 'dependencies': [ 475 'dependencies': [
476 'installer/installer.gyp:installer_util', 476 'installer_util',
477 'installer/installer.gyp:installer_util_strings', 477 'installer_util_strings',
478 '../breakpad/breakpad.gyp:breakpad_handler', 478 '../breakpad/breakpad.gyp:breakpad_handler',
479 '../breakpad/breakpad.gyp:breakpad_sender', 479 '../breakpad/breakpad.gyp:breakpad_sender',
480 '../sandbox/sandbox.gyp:sandbox', 480 '../sandbox/sandbox.gyp:sandbox',
481 'app/locales/locales.gyp:*', 481 'app/locales/locales.gyp:*',
482 ], 482 ],
483 'msvs_settings': { 483 'msvs_settings': {
484 'VCLinkerTool': { 484 'VCLinkerTool': {
485 'ImportLibrary': '$(OutDir)\\lib\\chrome_exe.lib', 485 'ImportLibrary': '$(OutDir)\\lib\\chrome_exe.lib',
486 'ProgramDatabaseFile': '$(OutDir)\\chrome_exe.pdb', 486 'ProgramDatabaseFile': '$(OutDir)\\chrome_exe.pdb',
487 }, 487 },
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
561 'product_name': 'nacl64', 561 'product_name': 'nacl64',
562 'msvs_guid': 'BB1AE956-038B-4092-96A2-951D2B418548', 562 'msvs_guid': 'BB1AE956-038B-4092-96A2-951D2B418548',
563 'variables': { 563 'variables': {
564 'chrome_exe_target': 1, 564 'chrome_exe_target': 1,
565 }, 565 },
566 'dependencies': [ 566 'dependencies': [
567 # On Windows make sure we've built Win64 version of chrome_dll, 567 # On Windows make sure we've built Win64 version of chrome_dll,
568 # which contains all of the library code with Chromium 568 # which contains all of the library code with Chromium
569 # functionality. 569 # functionality.
570 'chrome_dll_nacl_win64', 570 'chrome_dll_nacl_win64',
571 'installer/installer.gyp:installer_util_nacl_win64', 571 'installer_util_nacl_win64',
572 'common_constants_win64', 572 'common_constants_win64',
573 '../breakpad/breakpad.gyp:breakpad_handler_win64', 573 '../breakpad/breakpad.gyp:breakpad_handler_win64',
574 '../breakpad/breakpad.gyp:breakpad_sender_win64', 574 '../breakpad/breakpad.gyp:breakpad_sender_win64',
575 '../base/base.gyp:base_nacl_win64', 575 '../base/base.gyp:base_nacl_win64',
576 '../chrome_frame/chrome_frame.gyp:npchrome_frame', 576 '../chrome_frame/chrome_frame.gyp:npchrome_frame',
577 '../sandbox/sandbox.gyp:sandbox_win64', 577 '../sandbox/sandbox.gyp:sandbox_win64',
578 ], 578 ],
579 'defines': [ 579 'defines': [
580 '<@(nacl_win64_defines)', 580 '<@(nacl_win64_defines)',
581 ], 581 ],
582 'include_dirs': [ 582 'include_dirs': [
583 '<(SHARED_INTERMEDIATE_DIR)/chrome', 583 '<(SHARED_INTERMEDIATE_DIR)/chrome',
584 ], 584 ],
585 'msvs_settings': { 585 'msvs_settings': {
586 'VCLinkerTool': { 586 'VCLinkerTool': {
587 'ImportLibrary': '$(OutDir)\\lib\\nacl64_exe.lib', 587 'ImportLibrary': '$(OutDir)\\lib\\nacl64_exe.lib',
588 'ProgramDatabaseFile': '$(OutDir)\\nacl64_exe.pdb', 588 'ProgramDatabaseFile': '$(OutDir)\\nacl64_exe.pdb',
589 }, 589 },
590 }, 590 },
591 'configurations': { 591 'configurations': {
592 'Common_Base': { 592 'Common_Base': {
593 'msvs_target_platform': 'x64', 593 'msvs_target_platform': 'x64',
594 }, 594 },
595 }, 595 },
596 }, 596 },
597 ], 597 ],
598 }], 598 }],
599 ], 599 ],
600 } 600 }
OLDNEW
« no previous file with comments | « chrome/chrome_dll.gypi ('k') | chrome/chrome_installer.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698