diff options
| author | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-29 04:16:08 +0000 |
|---|---|---|
| committer | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-29 04:16:08 +0000 |
| commit | 6c6ad6473580090066749d1f51797ca1283ba6ef (patch) | |
| tree | df16f14c75c4f8fc3438bfb5da1724e354720072 /chrome/chrome_installer.gypi | |
| parent | 5ea30a8ef69a695bc20406c622e3b0423f3e5103 (diff) | |
| download | chromium_src-6c6ad6473580090066749d1f51797ca1283ba6ef.zip chromium_src-6c6ad6473580090066749d1f51797ca1283ba6ef.tar.gz chromium_src-6c6ad6473580090066749d1f51797ca1283ba6ef.tar.bz2 | |
Remove setup -> Chrome Frame dependency. Make it possible to build an installer for Aura.
BUG=156148
TEST=NONE
Review URL: https://chromiumcodereview.appspot.com/11192010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@164590 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_installer.gypi')
| -rw-r--r-- | chrome/chrome_installer.gypi | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/chrome/chrome_installer.gypi b/chrome/chrome_installer.gypi index a286f47..ea02442 100644 --- a/chrome/chrome_installer.gypi +++ b/chrome/chrome_installer.gypi @@ -261,11 +261,11 @@ 'installer_util', 'installer_util_strings', '../base/base.gyp:base', + '../breakpad/breakpad.gyp:breakpad_handler', '../build/temp_gyp/googleurl.gyp:googleurl', '../chrome/common_constants.gyp:common_constants', '../chrome_frame/chrome_frame.gyp:chrome_tab_idl', '../chrome_frame/chrome_frame.gyp:npchrome_frame', - '../breakpad/breakpad.gyp:breakpad_handler', '../rlz/rlz.gyp:rlz_lib', '../third_party/zlib/zlib.gyp:zlib', ], @@ -389,6 +389,15 @@ 'branding_dir_100': 'app/theme/default_100_percent/chromium', }, }], + ['use_aura==1', { + 'dependencies!': [ + '../chrome_frame/chrome_frame.gyp:chrome_tab_idl', + '../chrome_frame/chrome_frame.gyp:npchrome_frame', + ], + 'defines': [ + 'OMIT_CHROME_FRAME', + ], + }], ], }, { |