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 685 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 696 } else if (build_with_mozilla) { | 696 } else if (build_with_mozilla) { | 
| 697 include_dirs = [ getenv("DIST") + "/include/opus" ] | 697 include_dirs = [ getenv("DIST") + "/include/opus" ] | 
| 698 } | 698 } | 
| 699 } | 699 } | 
| 700 | 700 | 
| 701 source_set("audio_network_adaptor") { | 701 source_set("audio_network_adaptor") { | 
| 702 sources = [ | 702 sources = [ | 
| 703 "audio_network_adaptor/audio_network_adaptor.cc", | 703 "audio_network_adaptor/audio_network_adaptor.cc", | 
| 704 "audio_network_adaptor/audio_network_adaptor_impl.cc", | 704 "audio_network_adaptor/audio_network_adaptor_impl.cc", | 
| 705 "audio_network_adaptor/audio_network_adaptor_impl.h", | 705 "audio_network_adaptor/audio_network_adaptor_impl.h", | 
| 706 "audio_network_adaptor/channel_controller.cc", | 706 "audio_network_adaptor/channel_controller.cc", | 
| 
 
minyue-webrtc
2016/09/15 08:00:30
all changes in this file are due to rebasing
 
 | |
| 707 "audio_network_adaptor/channel_controller.h", | 707 "audio_network_adaptor/channel_controller.h", | 
| 708 "audio_network_adaptor/controller.cc", | 708 "audio_network_adaptor/controller.cc", | 
| 709 "audio_network_adaptor/controller.h", | 709 "audio_network_adaptor/controller.h", | 
| 710 "audio_network_adaptor/controller_manager.cc", | 710 "audio_network_adaptor/controller_manager.cc", | 
| 711 "audio_network_adaptor/controller_manager.h", | 711 "audio_network_adaptor/controller_manager.h", | 
| 712 "audio_network_adaptor/dtx_controller.cc", | |
| 713 "audio_network_adaptor/dtx_controller.h", | |
| 712 "audio_network_adaptor/include/audio_network_adaptor.h", | 714 "audio_network_adaptor/include/audio_network_adaptor.h", | 
| 713 ] | 715 ] | 
| 714 configs += [ "../..:common_config" ] | 716 configs += [ "../..:common_config" ] | 
| 715 public_configs = [ "../..:common_inherited_config" ] | 717 public_configs = [ "../..:common_inherited_config" ] | 
| 716 } | 718 } | 
| 717 | 719 | 
| 718 config("neteq_config") { | 720 config("neteq_config") { | 
| 719 include_dirs = [ | 721 include_dirs = [ | 
| 720 # Need Opus header files for the audio classifier. | 722 # Need Opus header files for the audio classifier. | 
| 721 "//third_party/opus/src/celt", | 723 "//third_party/opus/src/celt", | 
| (...skipping 844 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1566 "//testing/gtest", | 1568 "//testing/gtest", | 
| 1567 ] | 1569 ] | 
| 1568 | 1570 | 
| 1569 if (is_clang) { | 1571 if (is_clang) { | 
| 1570 # Suppress warnings from Chrome's Clang plugins. | 1572 # Suppress warnings from Chrome's Clang plugins. | 
| 1571 # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. | 1573 # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. | 
| 1572 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] | 1574 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] | 
| 1573 } | 1575 } | 
| 1574 } | 1576 } | 
| 1575 } | 1577 } | 
| OLD | NEW |