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

Side by Side Diff: webrtc/media/media.gyp

Issue 1915523002: Add a default implementation in metrics_default.cc of histograms methods in system_wrappers/interfac (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 7 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
OLDNEW
1 # Copyright (c) 2016 The WebRTC project authors. All Rights Reserved. 1 # Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
2 # 2 #
3 # Use of this source code is governed by a BSD-style license 3 # Use of this source code is governed by a BSD-style license
4 # that can be found in the LICENSE file in the root of the source 4 # that can be found in the LICENSE file in the root of the source
5 # tree. An additional intellectual property rights grant can be found 5 # tree. An additional intellectual property rights grant can be found
6 # in the file PATENTS. All contributing project authors may 6 # in the file PATENTS. All contributing project authors may
7 # be found in the AUTHORS file in the root of the source tree. 7 # be found in the AUTHORS file in the root of the source tree.
8 8
9 { 9 {
10 'includes': [ '../build/common.gypi', ], 10 'includes': [ '../build/common.gypi', ],
11 'targets': [ 11 'targets': [
12 { 12 {
13 'target_name': 'rtc_media', 13 'target_name': 'rtc_media',
14 'type': 'static_library', 14 'type': 'static_library',
15 'dependencies': [ 15 'dependencies': [
16 '<(webrtc_root)/base/base.gyp:rtc_base_approved', 16 '<(webrtc_root)/base/base.gyp:rtc_base_approved',
17 '<(webrtc_root)/common.gyp:webrtc_common', 17 '<(webrtc_root)/common.gyp:webrtc_common',
18 '<(webrtc_root)/webrtc.gyp:webrtc', 18 '<(webrtc_root)/webrtc.gyp:webrtc',
19 '<(webrtc_root)/voice_engine/voice_engine.gyp:voice_engine', 19 '<(webrtc_root)/voice_engine/voice_engine.gyp:voice_engine',
20 '<(webrtc_root)/system_wrappers/system_wrappers.gyp:metrics_default',
21 '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers', 20 '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers',
22 '<(webrtc_root)/libjingle/xmllite/xmllite.gyp:rtc_xmllite', 21 '<(webrtc_root)/libjingle/xmllite/xmllite.gyp:rtc_xmllite',
23 '<(webrtc_root)/libjingle/xmpp/xmpp.gyp:rtc_xmpp', 22 '<(webrtc_root)/libjingle/xmpp/xmpp.gyp:rtc_xmpp',
24 '<(webrtc_root)/p2p/p2p.gyp:rtc_p2p', 23 '<(webrtc_root)/p2p/p2p.gyp:rtc_p2p',
25 ], 24 ],
26 'direct_dependent_settings': { 25 'direct_dependent_settings': {
27 'include_dirs': [ 26 'include_dirs': [
28 '<(libyuv_dir)/include', 27 '<(libyuv_dir)/include',
29 ], 28 ],
30 }, 29 },
(...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after
207 'direct_dependent_settings': { 206 'direct_dependent_settings': {
208 'include_dirs': [ 207 'include_dirs': [
209 '<(libyuv_dir)/include', 208 '<(libyuv_dir)/include',
210 '<(DEPTH)/testing/gmock/include', 209 '<(DEPTH)/testing/gmock/include',
211 ], 210 ],
212 }, 211 },
213 'conditions': [ 212 'conditions': [
214 ['build_libyuv==1', { 213 ['build_libyuv==1', {
215 'dependencies': ['<(DEPTH)/third_party/libyuv/libyuv.gyp:libyuv',] , 214 'dependencies': ['<(DEPTH)/third_party/libyuv/libyuv.gyp:libyuv',] ,
216 }], 215 }],
216 ['OS!="android"', {
217 'dependencies': [
218 '<(webrtc_root)/system_wrappers/system_wrappers.gyp:metrics_defa ult',
219 ],
220 }],
217 ['OS=="ios"', { 221 ['OS=="ios"', {
218 # TODO(kjellander): Make the code compile without disabling these. 222 # TODO(kjellander): Make the code compile without disabling these.
219 # See https://bugs.chromium.org/p/webrtc/issues/detail?id=3307 223 # See https://bugs.chromium.org/p/webrtc/issues/detail?id=3307
220 'cflags': [ 224 'cflags': [
221 '-Wno-unused-variable', 225 '-Wno-unused-variable',
222 ], 226 ],
223 'xcode_settings': { 227 'xcode_settings': {
224 'WARNING_CFLAGS': [ 228 'WARNING_CFLAGS': [
225 '-Wno-unused-variable', 229 '-Wno-unused-variable',
226 ], 230 ],
(...skipping 26 matching lines...) Expand all
253 'cflags_cc!': [ 257 'cflags_cc!': [
254 '-Wnon-virtual-dtor', 258 '-Wnon-virtual-dtor',
255 ], 259 ],
256 }, # target rtc_unittest_main 260 }, # target rtc_unittest_main
257 { 261 {
258 'target_name': 'rtc_media_unittests', 262 'target_name': 'rtc_media_unittests',
259 'type': 'executable', 263 'type': 'executable',
260 'dependencies': [ 264 'dependencies': [
261 '<(webrtc_root)/base/base_tests.gyp:rtc_base_tests_utils', 265 '<(webrtc_root)/base/base_tests.gyp:rtc_base_tests_utils',
262 '<(webrtc_root)/media/media.gyp:rtc_media', 266 '<(webrtc_root)/media/media.gyp:rtc_media',
267 '<(webrtc_root)/system_wrappers/system_wrappers.gyp:metrics_default' ,
263 'rtc_unittest_main', 268 'rtc_unittest_main',
264 ], 269 ],
265 'sources': [ 270 'sources': [
266 'base/codec_unittest.cc', 271 'base/codec_unittest.cc',
267 'base/rtpdataengine_unittest.cc', 272 'base/rtpdataengine_unittest.cc',
268 'base/rtpdump_unittest.cc', 273 'base/rtpdump_unittest.cc',
269 'base/rtputils_unittest.cc', 274 'base/rtputils_unittest.cc',
270 'base/streamparams_unittest.cc', 275 'base/streamparams_unittest.cc',
271 'base/turnutils_unittest.cc', 276 'base/turnutils_unittest.cc',
272 'base/videoadapter_unittest.cc', 277 'base/videoadapter_unittest.cc',
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
365 'sources': [ 370 'sources': [
366 'rtc_media_unittests.isolate', 371 'rtc_media_unittests.isolate',
367 ], 372 ],
368 }, 373 },
369 ], 374 ],
370 }], 375 }],
371 ], # conditions 376 ], # conditions
372 }], # include_tests==1 377 }], # include_tests==1
373 ], # conditions 378 ], # conditions
374 } 379 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698