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

Side by Side Diff: chrome/chrome_tests.gypi

Issue 1369213004: Revert of Add crash_service to Telemetry's isolates. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@fck
Patch Set: Created 5 years, 2 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 unified diff | Download patch
« no previous file with comments | « no previous file | chrome/telemetry.isolate » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 'chrome_browser_extensions_test_support_sources': [ 6 'chrome_browser_extensions_test_support_sources': [
7 # A list of sources which is shared between different browser tests. 7 # A list of sources which is shared between different browser tests.
8 'browser/apps/app_browsertest_util.cc', 8 'browser/apps/app_browsertest_util.cc',
9 'browser/apps/app_browsertest_util.h', 9 'browser/apps/app_browsertest_util.h',
10 'browser/extensions/browsertest_util.cc', 10 'browser/extensions/browsertest_util.cc',
(...skipping 3208 matching lines...) Expand 10 before | Expand all | Expand 10 after
3219 # include this file via a wildcard (such as chrome_tests.gypi). 3219 # include this file via a wildcard (such as chrome_tests.gypi).
3220 # If we didn't do this the All target ends up with a rule that 3220 # If we didn't do this the All target ends up with a rule that
3221 # makes it unnecessarily compile in certain situations. 3221 # makes it unnecessarily compile in certain situations.
3222 'suppress_wildcard': 1, 3222 'suppress_wildcard': 1,
3223 'direct_dependent_settings': { 3223 'direct_dependent_settings': {
3224 'includes': [ 3224 'includes': [
3225 '../build/isolate.gypi', 3225 '../build/isolate.gypi',
3226 ], 3226 ],
3227 }, 3227 },
3228 }, 3228 },
3229 {
3230 'target_name': 'telemetry_gpu_unittests_run',
3231 'type': 'none',
3232 'dependencies': [
3233 '../content/content_shell_and_tests.gyp:telemetry_base',
3234 ],
3235 'includes': [
3236 '../build/isolate.gypi',
3237 ],
3238 'sources': [
3239 'telemetry_gpu_unittests.isolate',
3240 ],
3241 },
3242 { 3229 {
3243 'target_name': 'telemetry_chrome_test_base', 3230 'target_name': 'telemetry_chrome_test_base',
3244 'type': 'none', 3231 'type': 'none',
3245 'dependencies': [ 3232 'dependencies': [
3246 '../content/content_shell_and_tests.gyp:telemetry_base', 3233 '../content/content_shell_and_tests.gyp:telemetry_base',
3247 ], 3234 ],
3248 'conditions': [ 3235 'conditions': [
3249 ['OS=="linux" or OS=="mac"', { 3236 ['OS=="linux" or OS=="mac"', {
3250 'dependencies': [ 3237 'dependencies': [
3251 '../breakpad/breakpad.gyp:dump_syms', 3238 '../breakpad/breakpad.gyp:dump_syms',
3252 ], 3239 ],
3253 }], 3240 }],
3254 ['OS=="mac"', { 3241 ['OS=="mac"', {
3255 'dependencies': [ 3242 'dependencies': [
3256 '../third_party/crashpad/crashpad/tools/tools.gyp:crashpad_d atabase_util', 3243 '../third_party/crashpad/crashpad/tools/tools.gyp:crashpad_d atabase_util',
3257 ], 3244 ],
3258 }], 3245 }],
3259 ['OS=="win"', {
3260 'dependencies': [
3261 'chrome.gyp:crash_service',
3262 ],
3263 }],
3264 ], 3246 ],
3265 }, 3247 },
3266 { 3248 {
3267 # GN: //gpu:angle_unittests_run 3249 # GN: //gpu:angle_unittests_run
3268 'target_name': 'angle_unittests_run', 3250 'target_name': 'angle_unittests_run',
3269 'type': 'none', 3251 'type': 'none',
3270 'dependencies': [ 3252 'dependencies': [
3271 '../gpu/gpu.gyp:angle_unittests', 3253 '../gpu/gpu.gyp:angle_unittests',
3272 'gpu_tests_base', 3254 'gpu_tests_base',
3273 ], 3255 ],
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
3386 'utility', 3368 'utility',
3387 ], 3369 ],
3388 'sources': [ 3370 'sources': [
3389 'tools/service_discovery_sniffer/service_discovery_sniffer.cc', 3371 'tools/service_discovery_sniffer/service_discovery_sniffer.cc',
3390 'tools/service_discovery_sniffer/service_discovery_sniffer.h', 3372 'tools/service_discovery_sniffer/service_discovery_sniffer.h',
3391 ], 3373 ],
3392 }] 3374 }]
3393 }], 3375 }],
3394 ], # 'conditions' 3376 ], # 'conditions'
3395 } 3377 }
OLDNEW
« no previous file with comments | « no previous file | chrome/telemetry.isolate » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698