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

Unified Diff: chrome/chrome_dll.gypi

Issue 7464040: Integrate syzygy (optionally) into the chrome build process. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: always use intermediate chome_dll target on windows and pull syzygy from public repo Created 9 years, 5 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
Index: chrome/chrome_dll.gypi
===================================================================
--- chrome/chrome_dll.gypi (revision 95033)
+++ chrome/chrome_dll.gypi (working copy)
@@ -63,11 +63,22 @@
['OS=="mac" or OS=="win"', {
'targets': [
{
- 'target_name': 'chrome_dll',
- 'type': 'shared_library',
'variables': {
'chrome_dll_target': 1,
+ 'conditions' : [
+ ['OS=="win"', {
+ # On Windows we use build chrome_dll as an intermediate target
+ # then have a subsequent step which either optimizes it to its
+ # final location, or copies it to its final location, depending
+ # on whether or not optimize_with_syzygy==1.
+ 'dll_target_name': 'chrome_dll_initial',
+ }, {
+ 'dll_target_name': 'chrome_dll',
+ }],
+ ],
},
+ 'target_name': '<(dll_target_name)',
+ 'type': 'shared_library',
'dependencies': [
'<@(chromium_dependencies)',
'app/policy/cloud_policy_codegen.gyp:policy',
@@ -133,7 +144,16 @@
'msvs_settings': {
'VCLinkerTool': {
'ImportLibrary': '$(OutDir)\\lib\\chrome_dll.lib',
- 'ProgramDatabaseFile': '$(OutDir)\\chrome_dll.pdb',
+ # On Windows we use build chrome_dll as an intermediate target
+ # then have a subsequent step which either optimizes it to its
+ # final location, or copies it to its final location, based
+ # on whether or not optimize_with_syzygy==1.
+ 'ProgramDatabaseFile': '$(OutDir)\\initial\\chrome_dll.pdb',
chrisha 2011/08/03 17:16:27 Do you want this to be chrome_dll_initial.pdb as w
Roger McFarlane (Google) 2011/08/03 17:47:32 No, I retained the original basenames for the file
+ 'OutputFile': '$(OutDir)\\initial\chrome.dll',
Roger McFarlane (Google) 2011/08/03 17:47:32 Oops, that should be a double backslash between "i
+ # This corresponds to the /PROFILE flag which ensures the PDB
+ # file contains FIXUP information. This information is used
+ # by the Syzygy optimization tool.
+ 'Profile': 'true',
},
},
}], # OS=="win"

Powered by Google App Engine
This is Rietveld 408576698