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

Unified Diff: chrome/chrome_exe.gypi

Issue 7464040: Integrate syzygy (optionally) into the chrome build process. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Address nits. 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_exe.gypi
===================================================================
--- chrome/chrome_exe.gypi (revision 95033)
+++ chrome/chrome_exe.gypi (working copy)
@@ -415,10 +415,21 @@
],
}],
['OS=="mac" or OS=="win"', {
- 'dependencies': [
- # On Windows and Mac, make sure we've built chrome_dll, which
- # contains all of the library code with Chromium functionality.
- 'chrome_dll',
+ 'conditions': [
+ ['OS=="win" and optimize_with_syzygy==1', {
+ 'dependencies': [
+ # When syzygy is enabled on Windows, make sure we've built the
+ # original chrome_dll, so that the optimize step can run. The
+ # optimization step will generate the final chrome_dll.
+ 'original_chrome_dll',
+ ],
+ }, {
+ 'dependencies': [
+ # On Windows and Mac, make sure we've built chrome_dll, which
+ # contains all of the library code with Chromium functionality.
+ 'chrome_dll',
+ ],
+ }],
],
}],
['OS=="win"', {
« chrome/chrome_dll.gypi ('K') | « chrome/chrome_dll.gypi ('k') | chrome/syzygy.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698