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 869 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
880 "../..:webrtc_common", | 880 "../..:webrtc_common", |
881 "../../base:rtc_base_approved", | 881 "../../base:rtc_base_approved", |
882 ] | 882 ] |
883 } | 883 } |
884 | 884 |
885 if (rtc_enable_protobuf) { | 885 if (rtc_enable_protobuf) { |
886 proto_library("ana_debug_dump_proto") { | 886 proto_library("ana_debug_dump_proto") { |
887 sources = [ | 887 sources = [ |
888 "audio_network_adaptor/debug_dump.proto", | 888 "audio_network_adaptor/debug_dump.proto", |
889 ] | 889 ] |
890 proto_out_dir = "webrtc/modules/audio_coding/audio_network_adaptor" | 890 proto_in_dir = "//" |
891 proto_out_dir = "." | |
terelius
2017/01/19 12:23:40
Note that this is similar to the change that (prob
minyue-webrtc
2017/01/19 12:46:13
Thanks! This should not be needed either.
| |
891 } | 892 } |
892 proto_library("ana_config_proto") { | 893 proto_library("ana_config_proto") { |
893 sources = [ | 894 sources = [ |
894 "audio_network_adaptor/config.proto", | 895 "audio_network_adaptor/config.proto", |
895 ] | 896 ] |
896 proto_out_dir = "webrtc/modules/audio_coding/audio_network_adaptor" | 897 proto_out_dir = "webrtc/modules/audio_coding/audio_network_adaptor" |
897 } | 898 } |
898 } | 899 } |
899 | 900 |
900 rtc_static_library("audio_network_adaptor") { | 901 rtc_static_library("audio_network_adaptor") { |
901 sources = [ | 902 sources = [ |
902 "audio_network_adaptor/audio_network_adaptor.cc", | 903 "audio_network_adaptor/audio_network_adaptor.cc", |
903 "audio_network_adaptor/audio_network_adaptor_impl.cc", | 904 "audio_network_adaptor/audio_network_adaptor_impl.cc", |
904 "audio_network_adaptor/audio_network_adaptor_impl.h", | 905 "audio_network_adaptor/audio_network_adaptor_impl.h", |
905 "audio_network_adaptor/bitrate_controller.cc", | 906 "audio_network_adaptor/bitrate_controller.cc", |
906 "audio_network_adaptor/bitrate_controller.h", | 907 "audio_network_adaptor/bitrate_controller.h", |
907 "audio_network_adaptor/channel_controller.cc", | 908 "audio_network_adaptor/channel_controller.cc", |
908 "audio_network_adaptor/channel_controller.h", | 909 "audio_network_adaptor/channel_controller.h", |
909 "audio_network_adaptor/controller.cc", | 910 "audio_network_adaptor/controller.cc", |
910 "audio_network_adaptor/controller.h", | 911 "audio_network_adaptor/controller.h", |
911 "audio_network_adaptor/controller_manager.cc", | 912 "audio_network_adaptor/controller_manager.cc", |
912 "audio_network_adaptor/controller_manager.h", | 913 "audio_network_adaptor/controller_manager.h", |
913 "audio_network_adaptor/debug_dump_writer.cc", | 914 "audio_network_adaptor/debug_dump_writer.cc", |
914 "audio_network_adaptor/debug_dump_writer.h", | 915 "audio_network_adaptor/debug_dump_writer.h", |
915 "audio_network_adaptor/dtx_controller.cc", | 916 "audio_network_adaptor/dtx_controller.cc", |
916 "audio_network_adaptor/dtx_controller.h", | 917 "audio_network_adaptor/dtx_controller.h", |
918 "audio_network_adaptor/event_log_writer.cc", | |
919 "audio_network_adaptor/event_log_writer.h", | |
917 "audio_network_adaptor/fec_controller.cc", | 920 "audio_network_adaptor/fec_controller.cc", |
918 "audio_network_adaptor/fec_controller.h", | 921 "audio_network_adaptor/fec_controller.h", |
919 "audio_network_adaptor/frame_length_controller.cc", | 922 "audio_network_adaptor/frame_length_controller.cc", |
920 "audio_network_adaptor/frame_length_controller.h", | 923 "audio_network_adaptor/frame_length_controller.h", |
921 "audio_network_adaptor/include/audio_network_adaptor.h", | 924 "audio_network_adaptor/include/audio_network_adaptor.h", |
922 ] | 925 ] |
923 | 926 |
924 deps = [ | 927 deps = [ |
925 "../..:webrtc_common", | 928 "../..:webrtc_common", |
926 "../../base:rtc_base_approved", | 929 "../../base:rtc_base_approved", |
927 "../../common_audio", | 930 "../../common_audio", |
931 "../../logging:rtc_event_log_api", | |
928 "../../system_wrappers", | 932 "../../system_wrappers", |
929 ] | 933 ] |
930 | 934 |
931 if (rtc_enable_protobuf) { | 935 if (rtc_enable_protobuf) { |
932 deps += [ | 936 deps += [ |
933 ":ana_config_proto", | 937 ":ana_config_proto", |
934 ":ana_debug_dump_proto", | 938 ":ana_debug_dump_proto", |
935 ] | 939 ] |
936 defines = [ "WEBRTC_AUDIO_NETWORK_ADAPTOR_DEBUG_DUMP" ] | 940 defines = [ "WEBRTC_AUDIO_NETWORK_ADAPTOR_DEBUG_DUMP" ] |
937 } | 941 } |
942 | |
943 if (!build_with_chromium && is_clang) { | |
944 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). | |
945 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] | |
946 } | |
938 } | 947 } |
939 | 948 |
940 rtc_static_library("neteq") { | 949 rtc_static_library("neteq") { |
941 # TODO(kjellander): Remove (bugs.webrtc.org/6828) | 950 # TODO(kjellander): Remove (bugs.webrtc.org/6828) |
942 # Cyclic dependency with :audio_coding if enabled. | 951 # Cyclic dependency with :audio_coding if enabled. |
943 check_includes = false | 952 check_includes = false |
944 | 953 |
945 sources = [ | 954 sources = [ |
946 "neteq/accelerate.cc", | 955 "neteq/accelerate.cc", |
947 "neteq/accelerate.h", | 956 "neteq/accelerate.h", |
(...skipping 964 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1912 "../../test:test_main", | 1921 "../../test:test_main", |
1913 "//testing/gtest", | 1922 "//testing/gtest", |
1914 ] | 1923 ] |
1915 | 1924 |
1916 if (!build_with_chromium && is_clang) { | 1925 if (!build_with_chromium && is_clang) { |
1917 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). | 1926 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). |
1918 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] | 1927 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] |
1919 } | 1928 } |
1920 } | 1929 } |
1921 } | 1930 } |
OLD | NEW |