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

Side by Side Diff: chrome/chrome_exe.gypi

Issue 7759001: Revert 98426 - Revert 98103 - Switch to using .pak files for locale data on Windows. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 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 | Annotate | Revision Log
« no previous file with comments | « chrome/chrome.gyp ('k') | chrome/chrome_tests.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 '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 164 matching lines...) Expand 10 before | Expand all | Expand 10 after
175 ], 175 ],
176 }], 176 }],
177 ], 177 ],
178 'dependencies': [ 178 'dependencies': [
179 # On Linux, link the dependencies (libraries) that make up actual 179 # On Linux, link the dependencies (libraries) that make up actual
180 # Chromium functionality directly into the executable. 180 # Chromium functionality directly into the executable.
181 '<@(chromium_dependencies)', 181 '<@(chromium_dependencies)',
182 # Needed for chrome_main.cc initialization of libraries. 182 # Needed for chrome_main.cc initialization of libraries.
183 '../build/linux/system.gyp:dbus-glib', 183 '../build/linux/system.gyp:dbus-glib',
184 '../build/linux/system.gyp:gtk', 184 '../build/linux/system.gyp:gtk',
185 'packed_resources',
186 # Needed to use the master_preferences functions 185 # Needed to use the master_preferences functions
187 'installer_util', 186 'installer_util',
188 ], 187 ],
189 'sources': [ 188 'sources': [
190 'app/chrome_dll_resource.h', 189 'app/chrome_dll_resource.h',
191 'app/chrome_main.cc', 190 'app/chrome_main.cc',
192 'app/chrome_main_posix.cc', 191 'app/chrome_main_posix.cc',
193 ], 192 ],
194 }], 193 }],
195 ['OS=="mac"', { 194 ['OS=="mac"', {
(...skipping 240 matching lines...) Expand 10 before | Expand all | Expand 10 after
436 435
437 # On Mac, this is done in chrome_dll.gypi. 436 # On Mac, this is done in chrome_dll.gypi.
438 ['internal_pdf', { 437 ['internal_pdf', {
439 'dependencies': [ 438 'dependencies': [
440 '../pdf/pdf.gyp:pdf', 439 '../pdf/pdf.gyp:pdf',
441 ], 440 ],
442 }], 441 }],
443 ], 442 ],
444 'dependencies': [ 443 'dependencies': [
445 'packed_extra_resources', 444 'packed_extra_resources',
445 'packed_resources',
446 # Copy Flash Player files to PRODUCT_DIR if applicable. Let the .gyp 446 # Copy Flash Player files to PRODUCT_DIR if applicable. Let the .gyp
447 # file decide what to do on a per-OS basis; on Mac, internal plugins 447 # file decide what to do on a per-OS basis; on Mac, internal plugins
448 # go inside the framework, so this dependency is in chrome_dll.gypi. 448 # go inside the framework, so this dependency is in chrome_dll.gypi.
449 '../third_party/adobe/flash/flash_player.gyp:flash_player', 449 '../third_party/adobe/flash/flash_player.gyp:flash_player',
450 ], 450 ],
451 }], 451 }],
452 ['OS=="mac"', { 452 ['OS=="mac"', {
453 'dependencies': [ 453 'dependencies': [
454 # On Mac, make sure we've built chrome_dll, which contains all of 454 # On Mac, make sure we've built chrome_dll, which contains all of
455 # the library code with Chromium functionality. 455 # the library code with Chromium functionality.
(...skipping 16 matching lines...) Expand all
472 }], 472 }],
473 ['OS=="win"', { 473 ['OS=="win"', {
474 'dependencies': [ 474 'dependencies': [
475 'chrome_version_resources', 475 'chrome_version_resources',
476 'installer_util', 476 'installer_util',
477 'installer_util_strings', 477 'installer_util_strings',
478 '../base/base.gyp:base', 478 '../base/base.gyp:base',
479 '../breakpad/breakpad.gyp:breakpad_handler', 479 '../breakpad/breakpad.gyp:breakpad_handler',
480 '../breakpad/breakpad.gyp:breakpad_sender', 480 '../breakpad/breakpad.gyp:breakpad_sender',
481 '../sandbox/sandbox.gyp:sandbox', 481 '../sandbox/sandbox.gyp:sandbox',
482 'app/locales/locales.gyp:*',
483 'app/policy/cloud_policy_codegen.gyp:policy', 482 'app/policy/cloud_policy_codegen.gyp:policy',
484 ], 483 ],
485 'sources': [ 484 'sources': [
486 'app/chrome_exe.rc', 485 'app/chrome_exe.rc',
487 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/chrome_exe_version.rc', 486 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/chrome_exe_version.rc',
488 ], 487 ],
489 'msvs_settings': { 488 'msvs_settings': {
490 'VCLinkerTool': { 489 'VCLinkerTool': {
491 'ImportLibrary': '$(OutDir)\\lib\\chrome_exe.lib', 490 'ImportLibrary': '$(OutDir)\\lib\\chrome_exe.lib',
492 'ProgramDatabaseFile': '$(OutDir)\\chrome_exe.pdb', 491 'ProgramDatabaseFile': '$(OutDir)\\chrome_exe.pdb',
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
539 'configurations': { 538 'configurations': {
540 'Common_Base': { 539 'Common_Base': {
541 'msvs_target_platform': 'x64', 540 'msvs_target_platform': 'x64',
542 }, 541 },
543 }, 542 },
544 }, 543 },
545 ], 544 ],
546 }], 545 }],
547 ], 546 ],
548 } 547 }
OLDNEW
« no previous file with comments | « chrome/chrome.gyp ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698