Chromium Code Reviews| Index: chrome/chrome_tests.gypi |
| diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi |
| index 44ded319333b5b7688a7af3c493f6b7cc169c447..bcd989b1ded6577a0ebcb4205a94bc6bbde3d554 100644 |
| --- a/chrome/chrome_tests.gypi |
| +++ b/chrome/chrome_tests.gypi |
| @@ -2875,58 +2875,6 @@ |
| }, # target 'load_library_perf_tests' |
| ], |
| 'conditions': [ |
| - ['OS!="mac"', { |
| - 'targets': [ |
| - { |
| - # This test appears to be a legacy target consisting of files not yet |
| - # moved elsewhere. |
| - # |
| - # GN version: //chrome/test/perf |
| - 'target_name': 'perf_tests', |
| - 'type': 'executable', |
| - 'dependencies': [ |
| - '../base/base.gyp:base', |
| - '../base/base.gyp:test_support_perf', |
| - '../testing/gtest.gyp:gtest', |
| - '../url/url.gyp:url_lib', |
| - ], |
| - 'sources': [ |
| - # Note: Sources list duplicated in GN build. |
| - 'test/perf/perftests.cc', |
| - 'test/perf/url_parse_perftest.cc', |
|
tfarina
2015/02/18 19:17:40
I want to deal with url_parse_perftest.cc in a fol
Lei Zhang
2015/02/18 20:25:28
Do you want to deal with it first? If we land this
tfarina
2015/02/18 20:28:46
Maybe. The problem is that this file does nothing
|
| - ], |
| - 'conditions': [ |
| - ['OS=="win"', { |
| - 'configurations': { |
| - 'Debug_Base': { |
| - 'msvs_settings': { |
| - 'VCLinkerTool': { |
| - 'LinkIncremental': '<(msvs_large_module_debug_link_mode)', |
| - }, |
| - }, |
| - }, |
| - }, |
| - 'conditions': [ |
| - ['win_use_allocator_shim==1', { |
| - 'dependencies': [ |
| - '<(allocator_target)', |
| - ], |
| - }], |
| - ], |
| - }], |
| - ['os_posix == 1 and OS != "mac" and OS != "android"', { |
| - 'conditions': [ |
| - ['use_allocator!="none"', { |
| - 'dependencies': [ |
| - '../base/allocator/allocator.gyp:allocator', |
| - ], |
| - }], |
| - ], |
| - }], |
| - ], |
| - }, |
| - ], |
| - },], # OS!="mac" |
| ['OS == "android"', { |
| 'targets': [ |
| { |