Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2)

Unified Diff: build/all.gyp

Issue 542078: Adding a secondary mini_installer target for Chrome Frame. This will remove t... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 10 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « app/app.gyp ('k') | build/common.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/all.gyp
===================================================================
--- build/all.gyp (revision 36244)
+++ build/all.gyp (working copy)
@@ -46,11 +46,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',
@@ -93,6 +88,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:*',
@@ -209,6 +205,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',
@@ -238,6 +235,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',
« no previous file with comments | « app/app.gyp ('k') | build/common.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698