From 34b7a9186269b5ce8ac84c285715679f7edd37ef Mon Sep 17 00:00:00 2001
From: kjellander <kjellander@webrtc.org>
Date: Wed, 8 Mar 2017 01:41:14 -0800
Subject: [PATCH] Enable GN check for webrtc/modules/video_processing

BUG=webrtc:6828
NOTRY=True

Review-Url: https://codereview.webrtc.org/2719753002
Cr-Commit-Position: refs/heads/master@{#17106}
---
 webrtc/modules/video_processing/BUILD.gn | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/webrtc/modules/video_processing/BUILD.gn b/webrtc/modules/video_processing/BUILD.gn
index 6da43b422b..e43c88cbda 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" ]