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

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: 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_exe.gypi
===================================================================
--- chrome/chrome_exe.gypi (revision 95033)
+++ chrome/chrome_exe.gypi (working copy)
@@ -414,15 +414,21 @@
'../third_party/adobe/flash/flash_player.gyp:flash_player',
],
}],
- ['OS=="mac" or OS=="win"', {
+ ['OS=="mac"', {
'dependencies': [
- # On Windows and Mac, make sure we've built chrome_dll, which
- # contains all of the library code with Chromium functionality.
+ # On Mac, make sure we've built chrome_dll, which contains all of
+ # the library code with Chromium functionality.
'chrome_dll',
],
}],
['OS=="win"', {
'dependencies': [
+ # On Windows there is an intermediate target which builds an
+ # initial version of chrome_dll, then either optimizes it or
+ # copies to its final location. The optimization step also
+ # depends on chrome_exe, so here we depend on the initial
+ # chrome_dll.
+ 'chrome_dll_initial',
'chrome_version_resources',
'installer_util',
'installer_util_strings',

Powered by Google App Engine
This is Rietveld 408576698