summaryrefslogtreecommitdiffstats
path: root/chrome/chrome.gyp
diff options
context:
space:
mode:
authorsgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-16 18:23:29 +0000
committersgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-16 18:23:29 +0000
commitc51dfe4c3162451477d1895c79e782a20e8654d8 (patch)
treebfab8281891c545205fe4a9e7a34975cbb31196e /chrome/chrome.gyp
parent7227867a74c1178a7c8e6983843d184bf2d2e8a5 (diff)
downloadchromium_src-c51dfe4c3162451477d1895c79e782a20e8654d8.zip
chromium_src-c51dfe4c3162451477d1895c79e782a20e8654d8.tar.gz
chromium_src-c51dfe4c3162451477d1895c79e782a20e8654d8.tar.bz2
Restore .pdb file names to chrome_{dll,exe}.pdb (as expected by the
symbol infrastructure), not {product_name}.pdb. BUG=none TEST=none Review URL: http://codereview.chromium.org/125198 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18507 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome.gyp')
-rw-r--r--chrome/chrome.gyp18
1 files changed, 16 insertions, 2 deletions
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index aedb853..fb025ea 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -220,8 +220,20 @@
'<(grit_out_dir)/theme_resources.pak',
'<(grit_out_dir)/theme_resources.rc',
],
- 'action': ['python', '<(grit_path)', '-i', '<(input_path)', 'build',
- '-o', '<(grit_out_dir)', '-D', '<(chrome_build)'],
+ 'action': [
+ 'python', '<(grit_path)',
+ '-i', '<(input_path)', 'build',
+ '-o', '<(grit_out_dir)',
+ '-D', '<(chrome_build)'
+ ],
+ 'conditons': [
+ ['VAR=="foo"', {
+ 'action': [
+ 'extra',
+ 'arguments',
+ ],
+ }]
+ ],
'message': 'Generating resources from <(input_path)',
},
],
@@ -2541,6 +2553,7 @@
'msvs_settings': {
'VCLinkerTool': {
'ImportLibrary': '$(OutDir)\\lib\\chrome_exe.lib',
+ 'ProgramDatabaseFile': '$(OutDir)\\chrome_exe.pdb',
# Set /SUBSYSTEM:WINDOWS for chrome.exe itself.
'SubSystem': '2',
},
@@ -4104,6 +4117,7 @@
'imm32.dll',
],
'ImportLibrary': '$(OutDir)\\lib\\chrome_dll.lib',
+ 'ProgramDatabaseFile': '$(OutDir)\\chrome_dll.pdb',
# Set /SUBSYSTEM:WINDOWS for chrome.dll (for consistency).
'SubSystem': '2',
},