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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: webrtc/modules/audio_coding/BUILD.gn

Issue 2556943003: Refactor webrtc/{api,audio} and modules/audio_coding for GN check (Closed)
Patch Set: Created 4 years 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 side-by-side diff with in-line comments
Download patch
« .gn ('K') | « webrtc/modules/BUILD.gn ('k') | webrtc/test/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/modules/audio_coding/BUILD.gn
diff --git a/webrtc/modules/audio_coding/BUILD.gn b/webrtc/modules/audio_coding/BUILD.gn
index 77a9c3e2641a2d91427f87e03109b5f7ffa3ff9b..baeab6a814992b19f623010c4a5f08e5dee65145 100644
--- a/webrtc/modules/audio_coding/BUILD.gn
+++ b/webrtc/modules/audio_coding/BUILD.gn
@@ -77,25 +77,38 @@ rtc_source_set("audio_decoder_factory_interface") {
}
rtc_static_library("builtin_audio_decoder_factory") {
+ # TODO(kjellander): Remove (bugs.webrtc.org/6828)
+ # Errors on cyclic dependency with :isac_fix if enabled.
+ check_includes = false
+
sources = [
"codecs/builtin_audio_decoder_factory.cc",
"codecs/builtin_audio_decoder_factory.h",
]
deps = [
"../..:webrtc_common",
+ "../../base:rtc_base_approved",
":audio_decoder_factory_interface",
] + audio_codec_deps
defines = audio_codec_defines
}
rtc_static_library("rent_a_codec") {
+ # TODO(kjellander): Remove (bugs.webrtc.org/6828)
+ # Gives cyclic dependency with :neteq and :audio_coding if enabled.
+ check_includes = false
+
sources = [
"acm2/acm_codec_database.cc",
"acm2/acm_codec_database.h",
"acm2/rent_a_codec.cc",
"acm2/rent_a_codec.h",
]
- deps = [ "../..:webrtc_common" ] + audio_codec_deps
+ deps = [
+ ":audio_decoder_interface",
+ "../..:webrtc_common",
+ "../../base:rtc_base_approved",
+ ] + audio_codec_deps
defines = audio_codec_defines
}
@@ -140,8 +153,12 @@ rtc_static_library("audio_coding") {
}
deps = audio_coding_deps + [
+ ":audio_decoder_interface",
+ ":audio_decoder_factory_interface",
+ ":builtin_audio_decoder_factory",
":neteq",
":rent_a_codec",
+ "../../base:rtc_base_approved",
"../../logging:rtc_event_log_api",
]
defines = audio_coding_defines
@@ -190,6 +207,8 @@ rtc_static_library("cng") {
deps = [
":audio_encoder_interface",
+ "../..:webrtc_common",
+ "../../base:rtc_base_approved",
"../../common_audio",
]
}
@@ -208,6 +227,7 @@ rtc_static_library("red") {
deps = [
":audio_encoder_interface",
+ "../../base:rtc_base_approved",
"../../common_audio",
]
}
@@ -236,6 +256,8 @@ rtc_static_library("g711") {
deps = [
":audio_decoder_interface",
":audio_encoder_interface",
+ "../..:webrtc_common",
+ "../../base:rtc_base_approved",
]
}
@@ -264,6 +286,8 @@ rtc_static_library("g722") {
deps = [
":audio_decoder_interface",
":audio_encoder_interface",
+ "../..:webrtc_common",
+ "../../base:rtc_base_approved",
]
}
@@ -426,18 +450,27 @@ rtc_static_library("ilbc") {
deps = [
":audio_decoder_interface",
":audio_encoder_interface",
+ "../..:webrtc_common",
"../../base:rtc_base_approved",
"../../common_audio",
]
}
rtc_static_library("isac_common") {
+ # TODO(kjellander): Remove (bugs.webrtc.org/6828)
+ # Has a cyclic dependency with :isac if checks are enabled.
+ check_includes = false
+
sources = [
"codecs/isac/audio_encoder_isac_t.h",
"codecs/isac/audio_encoder_isac_t_impl.h",
"codecs/isac/locked_bandwidth_info.cc",
"codecs/isac/locked_bandwidth_info.h",
]
+ deps = [
+ ":audio_encoder_interface",
+ "../../base:rtc_base_approved",
+ ]
}
config("isac_config") {
@@ -585,7 +618,10 @@ rtc_static_library("isac_fix") {
deps = [
":audio_decoder_interface",
":audio_encoder_interface",
+ ":builtin_audio_decoder_factory",
":isac_common",
+ "../..:webrtc_common",
+ "../../base:rtc_base_approved",
"../../common_audio",
"../../system_wrappers",
]
@@ -684,6 +720,8 @@ rtc_static_library("pcm16b") {
":audio_decoder_interface",
":audio_encoder_interface",
":g711",
+ "../..:webrtc_common",
+ "../../base:rtc_base_approved",
]
public_configs = [ ":pcm16b_config" ]
@@ -708,8 +746,10 @@ rtc_static_library("webrtc_opus") {
":audio_decoder_interface",
":audio_encoder_interface",
":audio_network_adaptor",
+ "../..:webrtc_common",
"../../base:rtc_analytics",
"../../base:rtc_base_approved",
+ "../../system_wrappers",
]
defines = []
@@ -769,6 +809,8 @@ rtc_static_library("audio_network_adaptor") {
deps = [
"../..:webrtc_common",
+ "../../base:rtc_base_approved",
+ "../../common_audio",
"../../system_wrappers",
]
@@ -790,6 +832,10 @@ config("neteq_config") {
}
rtc_static_library("neteq") {
+ # TODO(kjellander): Remove (bugs.webrtc.org/6828)
+ # Cyclic dependency with :audio_coding if enabled.
+ check_includes = false
+
sources = [
"neteq/accelerate.cc",
"neteq/accelerate.h",
@@ -869,13 +915,18 @@ rtc_static_library("neteq") {
public_configs = [ ":neteq_config" ]
deps = [
+ ":audio_decoder_factory_interface",
":audio_decoder_interface",
+ ":audio_format",
":builtin_audio_decoder_factory",
":cng",
":g711",
+ ":isac_fix",
":pcm16b",
":rent_a_codec",
"../..:webrtc_common",
+ "../../base:gtest_prod",
+ "../../base:rtc_base_approved",
"../../common_audio",
"../../system_wrappers",
]
@@ -909,6 +960,11 @@ rtc_static_library("neteq") {
# does not set the rtc_include_tests flag.
rtc_source_set("neteq_test_minimal") {
testonly = true
+
+ # TODO(kjellander): Remove (bugs.webrtc.org/6828)
+ # Has cyclic dependency with :neteq_unittest_tools
+ check_includes = false
+
sources = [
"neteq/tools/encode_neteq_input.cc",
"neteq/tools/encode_neteq_input.h",
@@ -920,6 +976,14 @@ rtc_source_set("neteq_test_minimal") {
# Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
}
+
+ deps = [
+ ":audio_encoder_interface",
+ ":builtin_audio_decoder_factory",
+ ":neteq",
+ "../..:webrtc_common",
+ "../../base:rtc_base_approved",
+ ]
}
if (rtc_include_tests) {
@@ -970,7 +1034,12 @@ if (rtc_include_tests) {
deps = audio_coding_deps + [
":audio_coding",
+ ":audio_format_conversion",
+ ":audio_decoder_factory_interface",
+ ":builtin_audio_decoder_factory",
":neteq_unittest_tools",
+ "../../base:rtc_base_approved",
+ "../../test:test_support",
"//testing/gtest",
]
}
@@ -986,7 +1055,11 @@ if (rtc_include_tests) {
deps = audio_coding_deps + [
":audio_coding",
+ ":audio_decoder_interface",
+ ":audio_encoder_interface",
":neteq_unittest_tools",
+ "../../base:rtc_base_approved",
+ "../../test:test_support",
"//testing/gtest",
]
}
@@ -1004,6 +1077,7 @@ if (rtc_include_tests) {
":audio_coding",
":audio_format_conversion",
"../../:webrtc_common",
+ "../../base:rtc_base_approved",
"../../system_wrappers",
"../../system_wrappers:system_wrappers_default",
"../../test:test_support",
@@ -1030,6 +1104,7 @@ if (rtc_include_tests) {
":audio_coding",
":audio_format_conversion",
"../../:webrtc_common",
+ "../../base:rtc_base_approved",
"../../system_wrappers",
"../../system_wrappers:system_wrappers_default",
"../../test:test_support",
@@ -1100,6 +1175,11 @@ if (rtc_include_tests) {
rtc_static_library("rtc_event_log_source") {
testonly = true
+
+ # TODO(kjellander): Remove (bugs.webrtc.org/6828)
+ # Needs call.h to be moved to webrtc/api first.
+ check_includes = false
+
sources = [
"neteq/tools/rtc_event_log_source.cc",
"neteq/tools/rtc_event_log_source.h",
@@ -1111,6 +1191,7 @@ if (rtc_include_tests) {
}
deps = [
+ "../../base:rtc_base_approved",
"../../logging:rtc_event_log_parser",
]
public_deps = [
@@ -1141,6 +1222,8 @@ if (rtc_include_tests) {
deps += [
":neteq",
":neteq_unittest_tools",
+ "../..:webrtc_common",
+ "../../base:rtc_base_approved",
"../../system_wrappers:system_wrappers_default",
"../../test:test_support",
"//third_party/gflags",
@@ -1172,6 +1255,8 @@ if (rtc_include_tests) {
deps += [
":isac_fix",
":webrtc_opus",
+ "../..:webrtc_common",
+ "../../base:rtc_base_approved",
"../../system_wrappers:system_wrappers_default",
"../../test:test_main",
"../audio_processing",
@@ -1194,9 +1279,15 @@ if (rtc_include_tests) {
}
deps = [
+ ":audio_decoder_interface",
+ ":builtin_audio_decoder_factory",
":neteq",
":neteq_unittest_tools",
":pcm16b",
+ "../..:webrtc_common",
+ "../../base:rtc_base_approved",
+ "../../system_wrappers",
+ "../../test:test_support",
"//testing/gtest",
]
}
@@ -1214,8 +1305,12 @@ if (rtc_include_tests) {
}
deps = [
+ ":builtin_audio_decoder_factory",
":neteq",
":neteq_unittest_tools",
+ "../..:webrtc_common",
+ "../../base:rtc_base_approved",
+ "../../test:test_support",
"//testing/gtest",
"//third_party/gflags",
]
@@ -1266,12 +1361,20 @@ if (rtc_include_tests) {
}
deps = [
- ":neteq_test_minimal",
+ ":audio_decoder_interface",
+ ":audio_encoder_interface",
+ ":pcm16b",
+ "../..:webrtc_common",
+ "../../base:rtc_base_approved",
"../../common_audio",
"../../test:rtp_test_utils",
"../rtp_rtcp",
]
+ public_deps = [
+ ":neteq_test_minimal",
+ ]
+
if (rtc_enable_protobuf) {
deps += [ ":rtc_event_log_source" ]
}
@@ -1341,9 +1444,12 @@ if (rtc_include_tests) {
":g722",
":ilbc",
":isac",
+ ":neteq",
":neteq_test_tools",
":pcm16b",
":webrtc_opus",
+ "../..:webrtc_common",
+ "../../base:rtc_base_approved",
"../../common_audio",
]
@@ -1386,6 +1492,7 @@ if (rtc_include_tests) {
]
deps = [
+ "../../base:rtc_base_approved",
"../../system_wrappers:system_wrappers_default",
"../../test:rtp_test_utils",
"//testing/gtest",
@@ -1401,6 +1508,7 @@ if (rtc_include_tests) {
deps = [
":neteq_test_tools",
+ "../../test:test_support",
"//testing/gtest",
]
}
@@ -1410,6 +1518,7 @@ if (rtc_include_tests) {
deps = [
"../..:webrtc_common",
"../../base:rtc_base_approved",
+ "../../test:test_support",
"//testing/gtest",
]
sources = [
@@ -1467,6 +1576,7 @@ if (rtc_include_tests) {
deps = [
":neteq",
":neteq_test_support",
+ "../..:webrtc_common",
"../../system_wrappers:system_wrappers_default",
"../../test:test_support",
"//third_party/gflags",
@@ -1497,6 +1607,8 @@ if (rtc_include_tests) {
":neteq",
":neteq_quality_test_support",
":neteq_unittest_tools",
+ "../..:webrtc_common",
+ "../../base:rtc_base_approved",
"../../system_wrappers:system_wrappers_default",
"../../test:test_main",
"//testing/gtest",
@@ -1515,6 +1627,7 @@ if (rtc_include_tests) {
":isac_fix",
":neteq",
":neteq_quality_test_support",
+ "../../base:rtc_base_approved",
"../../test:test_main",
"//testing/gtest",
"//third_party/gflags",
@@ -1532,6 +1645,7 @@ if (rtc_include_tests) {
":g711",
":neteq",
":neteq_quality_test_support",
+ "../../base:rtc_base_approved",
"../../test:test_main",
"//testing/gtest",
"//third_party/gflags",
@@ -1679,7 +1793,6 @@ if (rtc_include_tests) {
"../../base:rtc_base_approved",
"../../common_audio",
"../../test:test_main",
- "../../test:test_support",
"//testing/gtest",
]
« .gn ('K') | « webrtc/modules/BUILD.gn ('k') | webrtc/test/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698