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

Side by Side Diff: webrtc/api/BUILD.gn

Issue 2456363002: Added audio mixer and removed audio device module in AudioState::Config. (Closed)
Patch Set: Removed default initializer. 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
« no previous file with comments | « no previous file | webrtc/api/api.gyp » ('j') | webrtc/api/call/audio_state.h » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2015 The WebRTC project authors. All Rights Reserved. 1 # Copyright (c) 2015 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 import("../build/webrtc.gni") 9 import("../build/webrtc.gni")
10 if (is_android) { 10 if (is_android) {
(...skipping 18 matching lines...) Expand all
29 "call/audio_receive_stream.h", 29 "call/audio_receive_stream.h",
30 "call/audio_send_stream.cc", 30 "call/audio_send_stream.cc",
31 "call/audio_send_stream.h", 31 "call/audio_send_stream.h",
32 "call/audio_sink.h", 32 "call/audio_sink.h",
33 "call/audio_state.h", 33 "call/audio_state.h",
34 "call/flexfec_receive_stream.h", 34 "call/flexfec_receive_stream.h",
35 ] 35 ]
36 36
37 deps = [ 37 deps = [
38 # TODO(kjellander): Add remaining dependencies when webrtc:4243 is done. 38 # TODO(kjellander): Add remaining dependencies when webrtc:4243 is done.
39 ":audio_mixer_api",
39 "..:webrtc_common", 40 "..:webrtc_common",
40 "../base:rtc_base_approved", 41 "../base:rtc_base_approved",
41 "../modules/audio_coding:audio_encoder_interface", 42 "../modules/audio_coding:audio_encoder_interface",
42 ] 43 ]
43 } 44 }
44 45
45 config("libjingle_peerconnection_warnings_config") { 46 config("libjingle_peerconnection_warnings_config") {
46 # GN orders flags on a target before flags from configs. The default config 47 # GN orders flags on a target before flags from configs. The default config
47 # adds these flags so to cancel them out they need to come from a config and 48 # adds these flags so to cancel them out they need to come from a config and
48 # cannot be on the target directly. 49 # cannot be on the target directly.
(...skipping 442 matching lines...) Expand 10 before | Expand all | Expand 10 after
491 492
492 shared_libraries = [ ":libjingle_peerconnection_so" ] 493 shared_libraries = [ ":libjingle_peerconnection_so" ]
493 } 494 }
494 495
495 android_resources("libjingle_peerconnection_android_unittest_resources") { 496 android_resources("libjingle_peerconnection_android_unittest_resources") {
496 resource_dirs = [ "androidtests/res" ] 497 resource_dirs = [ "androidtests/res" ]
497 custom_package = "org.webrtc" 498 custom_package = "org.webrtc"
498 } 499 }
499 } 500 }
500 } 501 }
OLDNEW
« no previous file with comments | « no previous file | webrtc/api/api.gyp » ('j') | webrtc/api/call/audio_state.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698