| Index: chrome/installer/mini_installer.gypi
|
| diff --git a/chrome/installer/mini_installer.gypi b/chrome/installer/mini_installer.gypi
|
| index 57eaf030138f4777dcfee1c91df90d925ffd1afa..b1e5a2b686639d61e0a56bf803378597cb43fac2 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',
|
| + }],
|
| ],
|
| }
|
|
|