Index: webrtc/modules/video_processing/BUILD.gn |
diff --git a/webrtc/modules/video_processing/BUILD.gn b/webrtc/modules/video_processing/BUILD.gn |
index 6da43b422b537989d964d10a2bc2f183d10c6b01..e43c88cbdab0fc61ae8fd525a7bdf43f9a9189f4 100644 |
--- a/webrtc/modules/video_processing/BUILD.gn |
+++ b/webrtc/modules/video_processing/BUILD.gn |
@@ -14,7 +14,6 @@ build_video_processing_sse2 = current_cpu == "x86" || current_cpu == "x64" |
rtc_static_library("video_processing") { |
sources = [ |
"util/denoiser_filter.cc", |
- "util/denoiser_filter.h", |
"util/denoiser_filter_c.cc", |
"util/denoiser_filter_c.h", |
"util/noise_estimation.cc", |
@@ -26,6 +25,7 @@ rtc_static_library("video_processing") { |
] |
deps = [ |
+ ":denoiser_filter", |
"../../base:rtc_base_approved", |
"../../common_audio", |
"../../common_video", |
@@ -45,18 +45,23 @@ rtc_static_library("video_processing") { |
} |
} |
+rtc_source_set("denoiser_filter") { |
+ # Target that only exists to avoid cyclic depdency errors for the SSE2 and |
+ # Neon implementations below. |
+ sources = [ |
+ "util/denoiser_filter.h", |
+ ] |
+} |
+ |
if (build_video_processing_sse2) { |
rtc_static_library("video_processing_sse2") { |
- # TODO(mbonadei): Remove (bugs.webrtc.org/6828) |
- # Errors on cyclic dependency with :video_processing if enabled. |
- check_includes = false |
- |
sources = [ |
"util/denoiser_filter_sse2.cc", |
"util/denoiser_filter_sse2.h", |
] |
deps = [ |
+ ":denoiser_filter", |
"../../base:rtc_base_approved", |
"../../system_wrappers", |
] |
@@ -74,15 +79,15 @@ if (build_video_processing_sse2) { |
if (rtc_build_with_neon) { |
rtc_static_library("video_processing_neon") { |
- # TODO(mbonadei): Remove (bugs.webrtc.org/6828) |
- # Errors on cyclic dependency with :video_processing if enabled. |
- check_includes = false |
- |
sources = [ |
"util/denoiser_filter_neon.cc", |
"util/denoiser_filter_neon.h", |
] |
+ deps = [ |
+ ":denoiser_filter", |
+ ] |
+ |
if (current_cpu != "arm64") { |
suppressed_configs += [ "//build/config/compiler:compiler_arm_fpu" ] |
cflags = [ "-mfpu=neon" ] |