diff options
| author | sebmarchand <sebmarchand@chromium.org> | 2015-03-25 11:42:03 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-03-25 18:42:51 +0000 |
| commit | b126d91631349406592514cb1a32c26f8fd79d62 (patch) | |
| tree | 9eb2eeec6f448c7b02cb1301add2b77421d3b285 /chrome/installer | |
| parent | c0fdb3e0566d3e81134c56e618b2577a8a15b549 (diff) | |
| download | chromium_src-b126d91631349406592514cb1a32c26f8fd79d62.zip chromium_src-b126d91631349406592514cb1a32c26f8fd79d62.tar.gz chromium_src-b126d91631349406592514cb1a32c26f8fd79d62.tar.bz2 | |
Force mini_installer to be optimized for size for the official builds.
It doesn't change anything to the current official build configuration ! 'size' is already the default value for the 'optimize' variable (https://code.google.com/p/chromium/codesearch#chromium/src/build/common.gypi&l=5411), but we override this value when doing a PGO build, so this is just preventing the mini_installer from being PGO optimized.
BUG=309849
Review URL: https://codereview.chromium.org/1037793004
Cr-Commit-Position: refs/heads/master@{#322198}
Diffstat (limited to 'chrome/installer')
| -rw-r--r-- | chrome/installer/mini_installer.gypi | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/chrome/installer/mini_installer.gypi b/chrome/installer/mini_installer.gypi index 57eaf03..b1e5a2b 100644 --- a/chrome/installer/mini_installer.gypi +++ b/chrome/installer/mini_installer.gypi @@ -223,15 +223,15 @@ 'message': 'Create installer archive', }, ], - # TODO(mark): <(branding_dir) should be defined by the - # global condition block at the bottom of the file, but - # this doesn't work due to the following issue: - # - # http://code.google.com/p/gyp/issues/detail?id=22 - # - # Remove this block once the above issue is fixed. 'conditions': [ - [ 'branding == "Chrome"', { + # TODO(mark): <(branding_dir) should be defined by the + # global condition block at the bottom of the file, but + # this doesn't work due to the following issue: + # + # http://code.google.com/p/gyp/issues/detail?id=22 + # + # Remove this block once the above issue is fixed. + ['branding == "Chrome"', { 'variables': { 'branding_dir': '../app/theme/google_chrome', }, @@ -240,5 +240,9 @@ 'branding_dir': '../app/theme/chromium', }, }], + ['OS=="win" and buildtype=="Official"', { + # Optimize for size when doing an official build. + 'optimize' :'size', + }], ], } |