Chromium Code Reviews| OLD | NEW | 
|---|---|
| 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 | 10 | 
| 11 rtc_static_library("audio") { | 11 rtc_static_library("audio") { | 
| 12 sources = [ | 12 sources = [ | 
| 13 "audio_receive_stream.cc", | 13 "audio_receive_stream.cc", | 
| 14 "audio_receive_stream.h", | 14 "audio_receive_stream.h", | 
| 15 "audio_send_stream.cc", | 15 "audio_send_stream.cc", | 
| 16 "audio_send_stream.h", | 16 "audio_send_stream.h", | 
| 17 "audio_state.cc", | 17 "audio_state.cc", | 
| 18 "audio_state.h", | 18 "audio_state.h", | 
| 19 "audio_transport_proxy.h", | |
| 19 "conversion.h", | 20 "conversion.h", | 
| 20 "scoped_voe_interface.h", | 21 "scoped_voe_interface.h", | 
| 21 ] | 22 ] | 
| 22 | 23 | 
| 23 if (!build_with_chromium && is_clang) { | 24 if (!build_with_chromium && is_clang) { | 
| 24 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). | 25 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). | 
| 25 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] | 26 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] | 
| 26 } | 27 } | 
| 27 | 28 | 
| 28 deps = [ | 29 deps = [ | 
| 29 "..:webrtc_common", | 30 "..:webrtc_common", | 
| 30 "../api:audio_mixer_api", | 31 "../api:audio_mixer_api", | 
| 31 "../api:call_api", | 32 "../api:call_api", | 
| 33 "../base:rtc_base_approved", | |
| 34 "../modules/audio_device", | |
| 35 "../modules/audio_processing", | |
| 32 "../system_wrappers", | 36 "../system_wrappers", | 
| 33 "../voice_engine", | 37 "../voice_engine", | 
| 34 ] | 38 ] | 
| 35 } | 39 } | 
| 36 if (rtc_include_tests) { | 40 if (rtc_include_tests) { | 
| 37 rtc_source_set("audio_tests") { | 41 rtc_source_set("audio_tests") { | 
| 38 testonly = true | 42 testonly = true | 
| 39 sources = [ | 43 sources = [ | 
| 40 "audio_receive_stream_unittest.cc", | 44 "audio_receive_stream_unittest.cc", | 
| 41 "audio_send_stream_unittest.cc", | 45 "audio_send_stream_unittest.cc", | 
| 42 "audio_state_unittest.cc", | 46 "audio_state_unittest.cc", | 
| 43 ] | 47 ] | 
| 44 deps = [ | 48 deps = [ | 
| 45 ":audio", | 49 ":audio", | 
| 46 "//testing/gmock", | 50 "//testing/gmock", | 
| 47 "//testing/gtest", | 51 "//testing/gtest", | 
| 48 ] | 52 ] | 
| 49 if (!build_with_chromium && is_clang) { | 53 if (!build_with_chromium && is_clang) { | 
| 50 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). | 54 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). | 
| 51 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] | 55 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] | 
| 52 } | 56 } | 
| 
 
aleloi
2016/11/01 15:53:34
Caused by including gmock file.
 
 | |
| 57 if (is_win) { | |
| 58 cflags = [ | |
| 59 # TODO(phoglund): get rid of 4373 supression when | |
| 60 # http://code.google.com/p/webrtc/issues/detail?id=261 is solved. | |
| 61 # legacy warning for ignoring const / volatile in signatures. | |
| 62 "/wd4373", | |
| 63 ] | |
| 64 } | |
| 53 } | 65 } | 
| 54 } | 66 } | 
| OLD | NEW |