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

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

Issue 2026223002: Remove metrics_default from rtc_media dependencies. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Add Android and Mac/iOS specific dependencies Created 4 years, 6 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 | « webrtc/api/api_tests.gyp ('k') | webrtc/pc/pc.gyp » ('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 (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)/p2p/p2p.gyp:rtc_p2p', 21 '<(webrtc_root)/p2p/p2p.gyp:rtc_p2p',
23 ], 22 ],
24 'direct_dependent_settings': { 23 'direct_dependent_settings': {
25 'include_dirs': [ 24 'include_dirs': [
26 '<(libyuv_dir)/include', 25 '<(libyuv_dir)/include',
27 ], 26 ],
28 }, 27 },
29 'sources': [ 28 'sources': [
30 'base/audiosource.h', 29 'base/audiosource.h',
(...skipping 214 matching lines...) Expand 10 before | Expand all | Expand 10 after
245 'engine/fakewebrtcvideoengine.h', 244 'engine/fakewebrtcvideoengine.h',
246 'engine/fakewebrtcvoiceengine.h', 245 'engine/fakewebrtcvoiceengine.h',
247 ], 246 ],
248 }, # target rtc_unittest_main 247 }, # target rtc_unittest_main
249 { 248 {
250 'target_name': 'rtc_media_unittests', 249 'target_name': 'rtc_media_unittests',
251 'type': 'executable', 250 'type': 'executable',
252 'dependencies': [ 251 'dependencies': [
253 '<(webrtc_root)/base/base_tests.gyp:rtc_base_tests_utils', 252 '<(webrtc_root)/base/base_tests.gyp:rtc_base_tests_utils',
254 '<(webrtc_root)/media/media.gyp:rtc_media', 253 '<(webrtc_root)/media/media.gyp:rtc_media',
254 '<(webrtc_root)/system_wrappers/system_wrappers.gyp:metrics_default' ,
255 'rtc_unittest_main', 255 'rtc_unittest_main',
256 ], 256 ],
257 'sources': [ 257 'sources': [
258 'base/codec_unittest.cc', 258 'base/codec_unittest.cc',
259 'base/rtpdataengine_unittest.cc', 259 'base/rtpdataengine_unittest.cc',
260 'base/rtpdump_unittest.cc', 260 'base/rtpdump_unittest.cc',
261 'base/rtputils_unittest.cc', 261 'base/rtputils_unittest.cc',
262 'base/streamparams_unittest.cc', 262 'base/streamparams_unittest.cc',
263 'base/turnutils_unittest.cc', 263 'base/turnutils_unittest.cc',
264 'base/videoadapter_unittest.cc', 264 'base/videoadapter_unittest.cc',
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
356 'sources': [ 356 'sources': [
357 'rtc_media_unittests.isolate', 357 'rtc_media_unittests.isolate',
358 ], 358 ],
359 }, 359 },
360 ], 360 ],
361 }], 361 }],
362 ], # conditions 362 ], # conditions
363 }], # include_tests==1 363 }], # include_tests==1
364 ], # conditions 364 ], # conditions
365 } 365 }
OLDNEW
« no previous file with comments | « webrtc/api/api_tests.gyp ('k') | webrtc/pc/pc.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698