Chromium Code Reviews

Unified Diff: trunk/src/chrome/chrome_dll.gypi

Issue 295093004: Revert 271737 "Revert 271721 "VS2013 Update 2"" (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
« no previous file with comments | « trunk/src/build/toolchain_vs2013.hash ('k') | trunk/src/chrome/chrome_tests.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/chrome/chrome_dll.gypi
===================================================================
--- trunk/src/chrome/chrome_dll.gypi (revision 271920)
+++ trunk/src/chrome/chrome_dll.gypi (working copy)
@@ -108,7 +108,6 @@
'dependencies': [
# On Windows, link the dependencies (libraries) that make
# up actual Chromium functionality into this .dll.
- 'chrome_dll_pdb_workaround',
'chrome_version_resources',
'../chrome/chrome_resources.gyp:chrome_unscaled_resources',
'../crypto/crypto.gyp:crypto',
@@ -328,29 +327,6 @@
}, # target chrome_main_dll
], # targets
}], # OS=="mac" or OS=="win"
- ['OS=="win"', {
- 'targets': [
- {
- # This target is only depended upon on Windows.
- 'target_name': 'chrome_dll_pdb_workaround',
- 'type': 'static_library',
- 'sources': [ 'empty_pdb_workaround.cc' ],
- 'conditions': [
- ['fastbuild==0 or win_z7!=0', {
- 'msvs_settings': {
- 'VCCLCompilerTool': {
- # This *in the compile phase* must match the pdb name that's
- # output by the final link. See empty_pdb_workaround.cc for
- # more details.
- 'DebugInformationFormat': '3',
- 'ProgramDataBaseFileName': '<(PRODUCT_DIR)/chrome.dll.pdb',
- },
- },
- }],
- ],
- },
- ],
- }],
['chrome_multiple_dll', {
'targets': [
{
« no previous file with comments | « trunk/src/build/toolchain_vs2013.hash ('k') | trunk/src/chrome/chrome_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine