| OLD | NEW |
| 1 # Copyright 2013 The Chromium Authors. All rights reserved. | 1 # Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 { | 4 { |
| 5 'variables': { | 5 'variables': { |
| 6 'build_angle_deqp_tests%': 0, | 6 'build_angle_deqp_tests%': 0, |
| 7 'chrome_browser_extensions_test_support_sources': [ | 7 'chrome_browser_extensions_test_support_sources': [ |
| 8 # A list of sources which is shared between different browser tests. | 8 # A list of sources which is shared between different browser tests. |
| 9 'browser/apps/app_browsertest_util.cc', | 9 'browser/apps/app_browsertest_util.cc', |
| 10 'browser/apps/app_browsertest_util.h', | 10 'browser/apps/app_browsertest_util.h', |
| (...skipping 3239 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3250 'type': 'none', | 3250 'type': 'none', |
| 3251 'dependencies': [ | 3251 'dependencies': [ |
| 3252 '../content/content_shell_and_tests.gyp:telemetry_base', | 3252 '../content/content_shell_and_tests.gyp:telemetry_base', |
| 3253 ], | 3253 ], |
| 3254 'conditions': [ | 3254 'conditions': [ |
| 3255 ['OS=="linux" or OS=="mac"', { | 3255 ['OS=="linux" or OS=="mac"', { |
| 3256 'dependencies': [ | 3256 'dependencies': [ |
| 3257 '../breakpad/breakpad.gyp:dump_syms#host', | 3257 '../breakpad/breakpad.gyp:dump_syms#host', |
| 3258 ], | 3258 ], |
| 3259 }], | 3259 }], |
| 3260 ['OS=="mac"', { | 3260 ['OS=="mac" or OS=="win"', { |
| 3261 'dependencies': [ | 3261 'dependencies': [ |
| 3262 # TODO(kbr): port this dependency to GN. |
| 3262 '../third_party/crashpad/crashpad/tools/tools.gyp:crashpad_datab
ase_util', | 3263 '../third_party/crashpad/crashpad/tools/tools.gyp:crashpad_datab
ase_util', |
| 3263 ], | 3264 ], |
| 3264 }], | 3265 }], |
| 3265 ['OS=="win"', { | |
| 3266 'dependencies': [ | |
| 3267 'chrome.gyp:crash_service', | |
| 3268 ], | |
| 3269 }], | |
| 3270 ], | 3266 ], |
| 3271 }, | 3267 }, |
| 3272 { | 3268 { |
| 3273 'target_name': 'gpu_tests_base', | 3269 'target_name': 'gpu_tests_base', |
| 3274 'type': 'none', | 3270 'type': 'none', |
| 3275 'dependencies': [ | 3271 'dependencies': [ |
| 3276 # depend on icu to fix races. http://crbug.com/417583 | 3272 # depend on icu to fix races. http://crbug.com/417583 |
| 3277 '../third_party/icu/icu.gyp:icudata', | 3273 '../third_party/icu/icu.gyp:icudata', |
| 3278 ], | 3274 ], |
| 3279 # Set this so we aren't included as a target in files that | 3275 # Set this so we aren't included as a target in files that |
| (...skipping 268 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3548 'browser', | 3544 'browser', |
| 3549 ], | 3545 ], |
| 3550 'sources': [ | 3546 'sources': [ |
| 3551 'tools/service_discovery_sniffer/service_discovery_sniffer.cc', | 3547 'tools/service_discovery_sniffer/service_discovery_sniffer.cc', |
| 3552 'tools/service_discovery_sniffer/service_discovery_sniffer.h', | 3548 'tools/service_discovery_sniffer/service_discovery_sniffer.h', |
| 3553 ], | 3549 ], |
| 3554 }] | 3550 }] |
| 3555 }], | 3551 }], |
| 3556 ], # 'conditions' | 3552 ], # 'conditions' |
| 3557 } | 3553 } |
| OLD | NEW |