From 00a5714fdfc1e222a0b2b250a2b8bd1c03ffa680 Mon Sep 17 00:00:00 2001 From: "grt@chromium.org" Date: Thu, 2 Jan 2014 21:13:40 +0000 Subject: [PATCH] Stop building Chrome Frame tests. They are no longer run on any bots, so save time by not building them. BUG=316496 Review URL: https://codereview.chromium.org/100213009 git-svn-id: http://src.chromium.org/svn/trunk/src/build@242796 4ff67af0-8c30-449e-8e8b-ad334ec8d88c --- all.gyp | 36 +++--------------------------------- 1 file changed, 3 insertions(+), 33 deletions(-) diff --git a/all.gyp b/all.gyp index 30255486b..dfd22ca93 100644 --- a/all.gyp +++ b/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 - '../chrome_frame/chrome_frame.gyp:*', + '../chrome_frame/chrome_frame.gyp:npchrome_frame', ], }], ], @@ -289,15 +289,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', ], @@ -851,15 +843,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', ], @@ -875,11 +859,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" @@ -1026,15 +1005,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',