Chromium Code Reviews| OLD | NEW | 
|---|---|
| 1 # Copyright (c) 2014 The WebRTC project authors. All Rights Reserved. | 1 # Copyright (c) 2014 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 import("audio_coding.gni") | 10 import("audio_coding.gni") | 
| (...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 107 } | 107 } | 
| 108 | 108 | 
| 109 if (is_win) { | 109 if (is_win) { | 
| 110 cflags = [ | 110 cflags = [ | 
| 111 # TODO(kjellander): Bug 261: fix this warning. | 111 # TODO(kjellander): Bug 261: fix this warning. | 
| 112 "/wd4373", # virtual function override. | 112 "/wd4373", # virtual function override. | 
| 113 ] | 113 ] | 
| 114 } | 114 } | 
| 115 | 115 | 
| 116 deps = audio_coding_deps + [ | 116 deps = audio_coding_deps + [ | 
| 117 ":audio_network_adaptor", | |
| 
 
minyue-webrtc
2016/10/06 15:59:18
audio_coding does not need to depend on audio_netw
 
kwiberg-webrtc
2016/10/07 12:14:25
Nice.
 
 | |
| 118 ":neteq", | 117 ":neteq", | 
| 119 ":rent_a_codec", | 118 ":rent_a_codec", | 
| 120 "../../logging:rtc_event_log_api", | 119 "../../logging:rtc_event_log_api", | 
| 121 ] | 120 ] | 
| 122 defines = audio_coding_defines | 121 defines = audio_coding_defines | 
| 123 } | 122 } | 
| 124 | 123 | 
| 125 rtc_static_library("audio_decoder_interface") { | 124 rtc_static_library("audio_decoder_interface") { | 
| 126 sources = [ | 125 sources = [ | 
| 127 "codecs/audio_decoder.cc", | 126 "codecs/audio_decoder.cc", | 
| (...skipping 575 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 703 proto_out_dir = "webrtc/modules/audio_coding/audio_network_adaptor" | 702 proto_out_dir = "webrtc/modules/audio_coding/audio_network_adaptor" | 
| 704 } | 703 } | 
| 705 proto_library("ana_config_proto") { | 704 proto_library("ana_config_proto") { | 
| 706 sources = [ | 705 sources = [ | 
| 707 "audio_network_adaptor/config.proto", | 706 "audio_network_adaptor/config.proto", | 
| 708 ] | 707 ] | 
| 709 proto_out_dir = "webrtc/modules/audio_coding/audio_network_adaptor" | 708 proto_out_dir = "webrtc/modules/audio_coding/audio_network_adaptor" | 
| 710 } | 709 } | 
| 711 } | 710 } | 
| 712 | 711 | 
| 713 source_set("audio_network_adaptor") { | 712 rtc_static_library("audio_network_adaptor") { | 
| 
 
minyue-webrtc
2016/10/06 15:59:18
all other targets uses rtc_static_library since ht
 
kwiberg-webrtc
2016/10/07 12:14:25
Acknowledged.
 
 | |
| 714 sources = [ | 713 sources = [ | 
| 715 "audio_network_adaptor/audio_network_adaptor.cc", | 714 "audio_network_adaptor/audio_network_adaptor.cc", | 
| 716 "audio_network_adaptor/audio_network_adaptor_impl.cc", | 715 "audio_network_adaptor/audio_network_adaptor_impl.cc", | 
| 717 "audio_network_adaptor/audio_network_adaptor_impl.h", | 716 "audio_network_adaptor/audio_network_adaptor_impl.h", | 
| 718 "audio_network_adaptor/bitrate_controller.cc", | 717 "audio_network_adaptor/bitrate_controller.cc", | 
| 719 "audio_network_adaptor/bitrate_controller.h", | 718 "audio_network_adaptor/bitrate_controller.h", | 
| 720 "audio_network_adaptor/channel_controller.cc", | 719 "audio_network_adaptor/channel_controller.cc", | 
| 721 "audio_network_adaptor/channel_controller.h", | 720 "audio_network_adaptor/channel_controller.h", | 
| 722 "audio_network_adaptor/controller.cc", | 721 "audio_network_adaptor/controller.cc", | 
| 723 "audio_network_adaptor/controller.h", | 722 "audio_network_adaptor/controller.h", | 
| 724 "audio_network_adaptor/controller_manager.cc", | 723 "audio_network_adaptor/controller_manager.cc", | 
| 725 "audio_network_adaptor/controller_manager.h", | 724 "audio_network_adaptor/controller_manager.h", | 
| 726 "audio_network_adaptor/debug_dump_writer.cc", | 725 "audio_network_adaptor/debug_dump_writer.cc", | 
| 727 "audio_network_adaptor/debug_dump_writer.h", | 726 "audio_network_adaptor/debug_dump_writer.h", | 
| 728 "audio_network_adaptor/dtx_controller.cc", | 727 "audio_network_adaptor/dtx_controller.cc", | 
| 729 "audio_network_adaptor/dtx_controller.h", | 728 "audio_network_adaptor/dtx_controller.h", | 
| 730 "audio_network_adaptor/fec_controller.cc", | 729 "audio_network_adaptor/fec_controller.cc", | 
| 731 "audio_network_adaptor/fec_controller.h", | 730 "audio_network_adaptor/fec_controller.h", | 
| 732 "audio_network_adaptor/frame_length_controller.cc", | 731 "audio_network_adaptor/frame_length_controller.cc", | 
| 733 "audio_network_adaptor/frame_length_controller.h", | 732 "audio_network_adaptor/frame_length_controller.h", | 
| 734 "audio_network_adaptor/include/audio_network_adaptor.h", | 733 "audio_network_adaptor/include/audio_network_adaptor.h", | 
| 735 "audio_network_adaptor/smoothing_filter.cc", | 734 "audio_network_adaptor/smoothing_filter.cc", | 
| 736 "audio_network_adaptor/smoothing_filter.h", | 735 "audio_network_adaptor/smoothing_filter.h", | 
| 737 ] | 736 ] | 
| 738 configs += [ "../..:common_config" ] | |
| 739 public_configs = [ "../..:common_inherited_config" ] | |
| 740 | 737 | 
| 741 deps = [ | 738 deps = [ | 
| 742 "../..:webrtc_common", | 739 "../..:webrtc_common", | 
| 743 "../../system_wrappers", | 740 "../../system_wrappers", | 
| 744 ] | 741 ] | 
| 745 | 742 | 
| 746 if (rtc_enable_protobuf) { | 743 if (rtc_enable_protobuf) { | 
| 747 deps += [ | 744 deps += [ | 
| 748 ":ana_config_proto", | 745 ":ana_config_proto", | 
| 749 ":ana_debug_dump_proto", | 746 ":ana_debug_dump_proto", | 
| (...skipping 871 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1621 "//testing/gtest", | 1618 "//testing/gtest", | 
| 1622 ] | 1619 ] | 
| 1623 | 1620 | 
| 1624 if (is_clang) { | 1621 if (is_clang) { | 
| 1625 # Suppress warnings from Chrome's Clang plugins. | 1622 # Suppress warnings from Chrome's Clang plugins. | 
| 1626 # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. | 1623 # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. | 
| 1627 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] | 1624 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] | 
| 1628 } | 1625 } | 
| 1629 } | 1626 } | 
| 1630 } | 1627 } | 
| OLD | NEW |