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

Unified Diff: chrome/chrome_dll.gypi

Issue 284663003: VS2013 Update 2 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix line endings on .hash file Created 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build/toolchain_vs2013.hash ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_dll.gypi
diff --git a/chrome/chrome_dll.gypi b/chrome/chrome_dll.gypi
index fc2cc1cbe06778a18bee950926bb86e928a102dd..ed50ed620227e2b1117d3c9e1a5013f043ae7b7e 100644
--- a/chrome/chrome_dll.gypi
+++ b/chrome/chrome_dll.gypi
@@ -104,7 +104,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',
@@ -326,29 +325,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 | « build/toolchain_vs2013.hash ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698