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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: build/all.gyp

Issue 100213009: Stop building Chrome Frame tests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years 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') | 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 c34de08f96717daec1cf1ef2f2439674d3ec7ae6..680729dc4812d0ffb7ed9a90ce5be7d0aa58f623 100644
--- a/build/all.gyp
+++ b/build/all.gyp
@@ -154,7 +154,7 @@
# TODO(jschuh) Enable Win64 Memory Watcher. crbug.com/176877
'../tools/memory_watcher/memory_watcher.gyp:*',
# TODO(jschuh) Enable Win64 Chrome Frame. crbug.com/176875
M-A Ruel 2013/12/17 20:43:49 I think crbug.com/176875 can be marked as WontFix.
grt (UTC plus 2) 2013/12/18 04:10:48 Done.
- '../chrome_frame/chrome_frame.gyp:*',
+ '../chrome_frame/chrome_frame.gyp:npchrome_frame',
M-A Ruel 2013/12/17 20:43:49 What's npchrome_frame, why is it needed?
grt (UTC plus 2) 2013/12/18 04:10:48 npchrome_frame is the target for the shipping bina
],
}],
],
@@ -288,15 +288,7 @@
'../ui/views/views.gyp:views_unittests',
],
'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',
- ]
- }, { # target_arch!="x64"
+ ['target_arch=="x64"', {
'dependencies!': [
'../chrome_frame/chrome_frame.gyp:npchrome_frame',
],
@@ -850,15 +842,7 @@
'../third_party/WebKit/public/blink_test_plugin.gyp:blink_test_plugin',
],
'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',
- ]
- }, { # target_arch!="x64"
+ ['target_arch=="x64"', {
'dependencies!': [
'../chrome_frame/chrome_frame.gyp:npchrome_frame',
],
@@ -874,11 +858,6 @@
'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"
@@ -1027,15 +1006,6 @@
'../chrome_frame/chrome_frame.gyp:npchrome_frame',
],
}],
- ['OS=="win" and 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',
- ],
- }],
['OS=="win" and target_arch=="x64"', {
'dependencies!': [
'../chrome_frame/chrome_frame.gyp:npchrome_frame',
« no previous file with comments | « no previous file | chrome/chrome.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698