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

Side by Side Diff: chromecast/chromecast.gyp

Issue 522853002: Chromecast fix: MetricsStateManager segfaults if callbacks are empty. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: file rename Created 6 years, 3 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 | chromecast/metrics/cast_metrics_service_client.cc » ('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 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 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 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 'chromecast_branding%': 'Chromium', 8 'chromecast_branding%': 'Chromium',
9 }, 9 },
10 'target_defaults': { 10 'target_defaults': {
(...skipping 27 matching lines...) Expand all
38 'sources': [ 38 'sources': [
39 'common/chromecast_config_simple.cc', 39 'common/chromecast_config_simple.cc',
40 ], 40 ],
41 }], 41 }],
42 ], 42 ],
43 }, 43 },
44 { 44 {
45 'target_name': 'cast_metrics', 45 'target_name': 'cast_metrics',
46 'type': '<(component)', 46 'type': '<(component)',
47 'dependencies': [ 47 'dependencies': [
48 'cast_common',
48 '../components/components.gyp:component_metrics_proto', 49 '../components/components.gyp:component_metrics_proto',
49 '../components/components.gyp:metrics', 50 '../components/components.gyp:metrics',
50 '../components/components.gyp:metrics_net', 51 '../components/components.gyp:metrics_net',
51 ], 52 ],
52 'sources': [ 53 'sources': [
53 'metrics/cast_metrics_prefs.cc', 54 'metrics/cast_metrics_prefs.cc',
54 'metrics/cast_metrics_prefs.h', 55 'metrics/cast_metrics_prefs.h',
55 'metrics/cast_metrics_service_client.cc', 56 'metrics/cast_metrics_service_client.cc',
56 'metrics/cast_metrics_service_client.h', 57 'metrics/cast_metrics_service_client.h',
57 'metrics/platform_metrics_providers.h', 58 'metrics/platform_metrics_providers.h',
58 ], 59 ],
59 'conditions': [ 60 'conditions': [
60 ['chromecast_branding=="Chrome"', { 61 ['chromecast_branding=="Chrome"', {
61 'dependencies': [ 62 'dependencies': [
62 '<(cast_internal_gyp):cast_metrics_internal', 63 '<(cast_internal_gyp):cast_metrics_internal',
63 ], 64 ],
64 }, { 65 }, {
65 'sources': [ 66 'sources': [
66 'metrics/platform_metrics_providers_simple.cc', 67 'metrics/platform_metrics_providers_simple.cc',
67 ], 68 ],
68 }], 69 }],
69 ], 70 ],
70 }, 71 },
71 { 72 {
73 'target_name': 'cast_metrics_unittests',
74 'type': '<(gtest_target_type)',
75 'dependencies': [
76 'cast_metrics',
77 '../base/base.gyp:base_prefs_test_support',
78 '../base/base.gyp:run_all_unittests',
79 '../base/base.gyp:test_support_base',
80 '../components/components.gyp:component_metrics_proto',
81 '../testing/gtest.gyp:gtest',
82 ],
83 'sources': [
84 'metrics/cast_metrics_service_client_unittest.cc',
85 ],
86 }, # end of target 'cast_metrics_unittests'
87 {
72 'target_name': 'cast_service', 88 'target_name': 'cast_service',
73 'type': '<(component)', 89 'type': '<(component)',
74 'dependencies': [ 90 'dependencies': [
75 '../skia/skia.gyp:skia', 91 '../skia/skia.gyp:skia',
76 ], 92 ],
77 'sources': [ 93 'sources': [
78 'service/cast_service.cc', 94 'service/cast_service.cc',
79 'service/cast_service.h', 95 'service/cast_service.h',
80 ], 96 ],
81 'conditions': [ 97 'conditions': [
(...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after
241 '<@(_outputs)', 257 '<@(_outputs)',
242 ], 258 ],
243 'includes': [ 259 'includes': [
244 '../build/util/version.gypi', 260 '../build/util/version.gypi',
245 ], 261 ],
246 }, 262 },
247 ], 263 ],
248 }, 264 },
249 ], # end of targets 265 ], # end of targets
250 } 266 }
OLDNEW
« no previous file with comments | « no previous file | chromecast/metrics/cast_metrics_service_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698