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

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

Issue 2469743002: Passed AudioMixer to AudioState::Config. (Closed)
Patch Set: Created 4 years, 1 month 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)/modules/modules.gyp:audio_mixer_impl',
19 '<(webrtc_root)/voice_engine/voice_engine.gyp:voice_engine', 20 '<(webrtc_root)/voice_engine/voice_engine.gyp:voice_engine',
20 '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers', 21 '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers',
21 '<(webrtc_root)/p2p/p2p.gyp:rtc_p2p', 22 '<(webrtc_root)/p2p/p2p.gyp:rtc_p2p',
22 ], 23 ],
23 'direct_dependent_settings': { 24 'direct_dependent_settings': {
24 'include_dirs': [ 25 'include_dirs': [
25 '<(libyuv_dir)/include', 26 '<(libyuv_dir)/include',
26 ], 27 ],
27 }, 28 },
28 'sources': [ 29 'sources': [
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
143 'devices/gtkvideorenderer.h', 144 'devices/gtkvideorenderer.h',
144 ], 145 ],
145 'cflags': [ 146 'cflags': [
146 '<!@(pkg-config --cflags gobject-2.0 gthread-2.0 gtk+-2.0)', 147 '<!@(pkg-config --cflags gobject-2.0 gthread-2.0 gtk+-2.0)',
147 ], 148 ],
148 }], 149 }],
149 ], 150 ],
150 }, # target rtc_media 151 }, # target rtc_media
151 ], # targets. 152 ], # targets.
152 } 153 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698