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

Unified Diff: build/all.gyp

Issue 12035084: Remove CF from all.gyp targets if use_aura is defined. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/all.gyp
diff --git a/build/all.gyp b/build/all.gyp
index b62c9b9bdb4b4e085e5d069cdab8b5a8679ac985..5d2fd75180105ead3123b95c4faee7196bca9c58 100644
--- a/build/all.gyp
+++ b/build/all.gyp
@@ -243,6 +243,16 @@
'../ui/views/views.gyp:views_unittests',
'../webkit/webkit.gyp:test_shell_common',
],
+ 'conditions': [
+ ['use_aura==1', {
+ 'dependencies!': [
+ '../chrome_frame/chrome_frame.gyp:npchrome_frame',
+ ],
+ 'defines': [
+ 'OMIT_CHROME_FRAME',
+ ],
+ }], # use_aura==1
+ ],
}],
['OS=="linux"', {
'dependencies': [
@@ -542,6 +552,16 @@
'../webkit/webkit.gyp:pull_in_copy_TestNetscapePlugIn',
'temp_gyp/googleurl.gyp:googleurl_unittests',
],
+ 'conditions': [
+ ['use_aura==1', {
+ 'dependencies!': [
+ '../chrome_frame/chrome_frame.gyp:npchrome_frame',
+ ],
+ 'defines': [
+ 'OMIT_CHROME_FRAME',
+ ],
+ }], # use_aura==1
+ ],
},
{
'target_name': 'chromium_builder_win_cf',
@@ -646,6 +666,14 @@
'../remoting/remoting.gyp:remoting_host_installation',
],
}], # component != "shared_library"
+ ['use_aura==1', {
+ 'dependencies!': [
+ '../chrome_frame/chrome_frame.gyp:npchrome_frame',
+ ],
+ 'defines': [
+ 'OMIT_CHROME_FRAME',
+ ],
+ }], # use_aura==1
]
},
], # targets
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698