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

Unified Diff: build/all.gyp

Issue 12220101: Minimal Chrome Frame with Aura. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: revert install_worker.cc to un-break win64 build Created 7 years, 10 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 | chrome/browser/automation/automation_provider.h » ('j') | 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 ddb6558d09debc1e494300b96905299d171d2f23..dfc381116eeb161b16f200b05233d9b70196588d 100644
--- a/build/all.gyp
+++ b/build/all.gyp
@@ -258,15 +258,14 @@
'../chrome_frame/chrome_frame.gyp:chrome_frame_tests',
'../chrome_frame/chrome_frame.gyp:chrome_frame_unittests',
]
- }], # target_arch!="x64"
- ['use_aura==1 or target_arch=="x64"', {
+ }, { # target_arch!="x64"
'dependencies!': [
'../chrome_frame/chrome_frame.gyp:npchrome_frame',
],
'defines': [
'OMIT_CHROME_FRAME',
],
- }], # use_aura==1 or target_arch=="x64"
+ }], # target_arch=="x64"
],
}],
['OS=="linux"', {
@@ -579,15 +578,14 @@
'../chrome_frame/chrome_frame.gyp:chrome_frame_tests',
'../chrome_frame/chrome_frame.gyp:chrome_frame_unittests',
]
- }], # target_arch!="x64"
- ['use_aura==1 or target_arch=="x64"', {
+ }, { # target_arch!="x64"
'dependencies!': [
'../chrome_frame/chrome_frame.gyp:npchrome_frame',
],
'defines': [
'OMIT_CHROME_FRAME',
],
- }], # use_aura==1 or target_arch=="x64"
+ }], # target_arch=="x64"
],
},
{
@@ -706,14 +704,14 @@
'../remoting/remoting.gyp:remoting_host_installation',
],
}], # component != "shared_library"
- ['use_aura==1 or target_arch=="x64"', {
+ ['target_arch=="x64"', {
'dependencies!': [
'../chrome_frame/chrome_frame.gyp:npchrome_frame',
],
'defines': [
'OMIT_CHROME_FRAME',
],
- }], # use_aura==1 or target_arch=="x64"
+ }], # target_arch=="x64"
]
},
], # targets
« no previous file with comments | « no previous file | chrome/browser/automation/automation_provider.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698