diff options
Diffstat (limited to 'build')
| -rw-r--r-- | build/all.gyp | 8 | ||||
| -rw-r--r-- | build/common.gypi | 9 |
2 files changed, 3 insertions, 14 deletions
diff --git a/build/all.gyp b/build/all.gyp index 7566802..8a0910b 100644 --- a/build/all.gyp +++ b/build/all.gyp @@ -48,11 +48,6 @@ '../v8/tools/gyp/v8.gyp:*', ], }], - ['chrome_frame_define==1', { - 'dependencies': [ - '../chrome_frame/chrome_frame.gyp:*', - ], - }], ['OS=="mac" or OS=="linux" or OS=="freebsd"', { 'dependencies': [ '../third_party/yasm/yasm.gyp:*#host', @@ -95,6 +90,7 @@ 'dependencies': [ '../breakpad/breakpad.gyp:*', '../chrome/app/locales/locales.gyp:*', + '../chrome_frame/chrome_frame.gyp:*', '../courgette/courgette.gyp:*', '../gears/gears.gyp:*', '../gpu/demos/demos.gyp:*', @@ -212,6 +208,7 @@ # mini_installer_tests depends on mini_installer. This should be # defined in installer.gyp. '../chrome/installer/mini_installer.gyp:mini_installer', + '../chrome/installer/mini_installer.gyp:chrome_frame_mini_installer', '../courgette/courgette.gyp:courgette_unittests', '../ipc/ipc.gyp:ipc_tests', '../media/media.gyp:media_unittests', @@ -241,6 +238,7 @@ # mini_installer_tests depends on mini_installer. This should be # defined in installer.gyp. '../chrome/installer/mini_installer.gyp:mini_installer', + '../chrome/installer/mini_installer.gyp:chrome_frame_mini_installer', '../courgette/courgette.gyp:courgette_unittests', '../chrome/chrome.gyp:chrome', '../chrome_frame/chrome_frame.gyp:npchrome_frame', diff --git a/build/common.gypi b/build/common.gypi index 164095d..4f6d4bb 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -149,12 +149,6 @@ # to compile as shared by default 'library%': 'static_library', - # The Google Update appid. - 'google_update_appid%': '{8A69D345-D564-463c-AFF1-A69D9E530F96}', - - # Whether to add the experimental build define. - 'chrome_frame_define%': 0, - # Whether usage of OpenMAX is enabled. 'enable_openmax%': 0, @@ -321,9 +315,6 @@ }, { # else: branding!="Chrome" 'defines': ['CHROMIUM_BUILD'], }], - ['chrome_frame_define', { - 'defines': ['CHROME_FRAME_BUILD'], - }], ['toolkit_views==1 or chromeos==1', { 'defines': ['TOOLKIT_VIEWS=1'], }], |