| Index: chrome/installer/installer.gyp
|
| ===================================================================
|
| --- chrome/installer/installer.gyp (revision 29380)
|
| +++ chrome/installer/installer.gyp (working copy)
|
| @@ -333,14 +333,19 @@
|
| ],
|
| },
|
| ],
|
| - # 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': [
|
| + ['chrome_frame_define==1', {
|
| + 'dependencies': [
|
| + '../../chrome_frame/chrome_frame.gyp:npchrome_tab',
|
| + ],
|
| + }],
|
| + # 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',
|
|
|