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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: build/all.gyp

Issue 12315062: Disable Chrome Frame in Win64 build (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: 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/chrome.gyp » ('j') | chrome/chrome_installer.gypi » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/all.gyp
===================================================================
--- build/all.gyp (revision 184179)
+++ build/all.gyp (working copy)
@@ -130,11 +130,12 @@
'dependencies': [
# TODO(jschuh) Enable Win64 Memory Watcher. crbug.com/176877
'../tools/memory_watcher/memory_watcher.gyp:*',
+ # TODO(jschuh) Enable Win64 Chrome Frame. crbug.com/176875
+ '../chrome_frame/chrome_frame.gyp:*',
],
}],
],
'dependencies': [
- '../chrome_frame/chrome_frame.gyp:*',
'../cloud_print/cloud_print.gyp:*',
'../courgette/courgette.gyp:*',
'../rlz/rlz.gyp:*',
@@ -238,11 +239,6 @@
# mini_installer_tests depends on mini_installer. This should be
# defined in installer.gyp.
'../chrome/installer/mini_installer.gyp:mini_installer',
- '../chrome_frame/chrome_frame.gyp:chrome_frame_net_tests',
- '../chrome_frame/chrome_frame.gyp:chrome_frame_perftests',
- '../chrome_frame/chrome_frame.gyp:chrome_frame_reliability_tests',
- '../chrome_frame/chrome_frame.gyp:chrome_frame_tests',
- '../chrome_frame/chrome_frame.gyp:chrome_frame_unittests',
'../chrome_frame/chrome_frame.gyp:npchrome_frame',
'../courgette/courgette.gyp:courgette_unittests',
'../sandbox/sandbox.gyp:sbox_integration_tests',
@@ -254,14 +250,23 @@
'../webkit/webkit.gyp:test_shell_common',
],
'conditions': [
- ['use_aura==1', {
+ ['target_arch!="x64"', {
+ 'dependencies': [
+ '../chrome_frame/chrome_frame.gyp:chrome_frame_net_tests',
+ '../chrome_frame/chrome_frame.gyp:chrome_frame_perftests',
+ '../chrome_frame/chrome_frame.gyp:chrome_frame_reliability_tests',
+ '../chrome_frame/chrome_frame.gyp:chrome_frame_tests',
+ '../chrome_frame/chrome_frame.gyp:chrome_frame_unittests',
+ ]
robertshield 2013/02/25 00:37:36 minor nit, but consider leaving these where they a
jschuh 2013/02/25 01:10:02 I wrote it that way originally, but it felt more c
+ }], # target_arch!="x64"
+ ['use_aura==1 or target_arch=="x64"', {
'dependencies!': [
'../chrome_frame/chrome_frame.gyp:npchrome_frame',
],
'defines': [
'OMIT_CHROME_FRAME',
],
- }], # use_aura==1
+ }], # use_aura==1 or target_arch=="x64"
],
}],
['OS=="linux"', {
@@ -545,11 +550,6 @@
# mini_installer_tests depends on mini_installer. This should be
# defined in installer.gyp.
'../chrome/installer/mini_installer.gyp:mini_installer',
- '../chrome_frame/chrome_frame.gyp:chrome_frame_net_tests',
- '../chrome_frame/chrome_frame.gyp:chrome_frame_perftests',
- '../chrome_frame/chrome_frame.gyp:chrome_frame_reliability_tests',
- '../chrome_frame/chrome_frame.gyp:chrome_frame_tests',
- '../chrome_frame/chrome_frame.gyp:chrome_frame_unittests',
'../chrome_frame/chrome_frame.gyp:npchrome_frame',
'../courgette/courgette.gyp:courgette_unittests',
'../device/device.gyp:device_unittests',
@@ -571,26 +571,39 @@
'temp_gyp/googleurl.gyp:googleurl_unittests',
],
'conditions': [
- ['use_aura==1', {
+ ['target_arch!="x64"', {
robertshield 2013/02/25 00:37:36 Same comment here about adding these to the 'depen
+ 'dependencies': [
+ '../chrome_frame/chrome_frame.gyp:chrome_frame_net_tests',
+ '../chrome_frame/chrome_frame.gyp:chrome_frame_perftests',
+ '../chrome_frame/chrome_frame.gyp:chrome_frame_reliability_tests',
+ '../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"', {
'dependencies!': [
'../chrome_frame/chrome_frame.gyp:npchrome_frame',
],
'defines': [
'OMIT_CHROME_FRAME',
],
- }], # use_aura==1
+ }], # use_aura==1 or target_arch=="x64"
],
},
{
'target_name': 'chromium_builder_win_cf',
'type': 'none',
- 'dependencies': [
- '../chrome_frame/chrome_frame.gyp:chrome_frame_net_tests',
- '../chrome_frame/chrome_frame.gyp:chrome_frame_perftests',
- '../chrome_frame/chrome_frame.gyp:chrome_frame_reliability_tests',
- '../chrome_frame/chrome_frame.gyp:chrome_frame_tests',
- '../chrome_frame/chrome_frame.gyp:chrome_frame_unittests',
- '../chrome_frame/chrome_frame.gyp:npchrome_frame',
+ 'conditions': [
+ ['target_arch!="x64"', {
+ 'dependencies': [
+ '../chrome_frame/chrome_frame.gyp:chrome_frame_net_tests',
+ '../chrome_frame/chrome_frame.gyp:chrome_frame_perftests',
+ '../chrome_frame/chrome_frame.gyp:chrome_frame_reliability_tests',
+ '../chrome_frame/chrome_frame.gyp:chrome_frame_tests',
+ '../chrome_frame/chrome_frame.gyp:chrome_frame_unittests',
+ '../chrome_frame/chrome_frame.gyp:npchrome_frame',
+ ],
+ }], # target_arch!="x64"
],
},
{
@@ -687,14 +700,14 @@
'../remoting/remoting.gyp:remoting_host_installation',
],
}], # component != "shared_library"
- ['use_aura==1', {
+ ['use_aura==1 or target_arch=="x64"', {
'dependencies!': [
'../chrome_frame/chrome_frame.gyp:npchrome_frame',
],
'defines': [
'OMIT_CHROME_FRAME',
],
- }], # use_aura==1
+ }], # use_aura==1 or target_arch=="x64"
]
},
], # targets
« no previous file with comments | « no previous file | chrome/chrome.gyp » ('j') | chrome/chrome_installer.gypi » ('J')

Powered by Google App Engine
This is Rietveld 408576698