From 50550e1440f28e45d443a0563d0bb16b579af2d1 Mon Sep 17 00:00:00 2001
From: kjellander <kjellander@webrtc.org>
Date: Wed, 1 Mar 2017 07:07:10 -0800
Subject: [PATCH] Enable GN check for webrtc/common_audio

BUG=webrtc:6828
NOTRY=True

Review-Url: https://codereview.webrtc.org/2719743002
Cr-Commit-Position: refs/heads/master@{#16946}
---
 .gn                          |  1 +
 webrtc/common_audio/BUILD.gn | 49 +++++++++++++++++++++++++++++++++++-
 2 files changed, 49 insertions(+), 1 deletion(-)

diff --git a/.gn b/.gn
index d495e665e2..762273cff6 100644
--- a/.gn
+++ b/.gn
@@ -26,6 +26,7 @@ check_targets = [
   "//webrtc/audio/*",
   "//webrtc/call/*",
   "//webrtc/common_video/*",
+  "//webrtc/common_audio/*",
   "//webrtc/modules/audio_coding/*",
   "//webrtc/modules/audio_conference_mixer/*",
   "//webrtc/modules/audio_device/*",
diff --git a/webrtc/common_audio/BUILD.gn b/webrtc/common_audio/BUILD.gn
index a3cf046bb4..6162793a6d 100644
--- a/webrtc/common_audio/BUILD.gn
+++ b/webrtc/common_audio/BUILD.gn
@@ -46,7 +46,6 @@ rtc_static_library("common_audio") {
     "resampler/push_sinc_resampler.h",
     "resampler/resampler.cc",
     "resampler/sinc_resampler.cc",
-    "resampler/sinc_resampler.h",
     "smoothing_filter.cc",
     "smoothing_filter.h",
     "sparse_fir_filter.cc",
@@ -62,6 +61,10 @@ rtc_static_library("common_audio") {
   ]
 
   deps = [
+    ":sinc_resampler",
+    "..:webrtc_common",
+    "../base:gtest_prod",
+    "../base:rtc_base_approved",
     "../system_wrappers",
   ]
   public_deps = [
@@ -199,10 +202,33 @@ rtc_source_set("common_audio_c") {
   }
 
   public_configs = [ ":common_audio_config" ]
+  deps = [
+    "..:webrtc_common",
+    "../base:rtc_base_approved",
+    "../system_wrappers:system_wrappers",
+  ]
+}
+
+rtc_source_set("sinc_resampler") {
+  sources = [
+    "resampler/sinc_resampler.h",
+  ]
+  deps = [
+    "..:webrtc_common",
+    "../base:gtest_prod",
+    "../base:rtc_base_approved",
+    "../system_wrappers",
+  ]
 }
 
 if (current_cpu == "x86" || current_cpu == "x64") {
   rtc_static_library("common_audio_sse2") {
+    # TODO(kjellander): Remove (bugs.webrtc.org/6828)
+    # Enabling GN check triggers dependency cycle:
+    #   //webrtc/common_audio:common_audio ->
+    #   //webrtc/common_audio:common_audio_sse2 ->
+    #   //webrtc/common_audio:common_audio
+    check_includes = false
     sources = [
       "fir_filter_sse.cc",
       "resampler/sinc_resampler_sse.cc",
@@ -216,11 +242,20 @@ if (current_cpu == "x86" || current_cpu == "x64") {
       # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
       suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
     }
+    deps = [
+      ":sinc_resampler",
+    ]
   }
 }
 
 if (rtc_build_with_neon) {
   rtc_static_library("common_audio_neon") {
+    # TODO(kjellander): Remove (bugs.webrtc.org/6828)
+    # Enabling GN check triggers dependency cycle:
+    #   //webrtc/common_audio:common_audio ->
+    #   //webrtc/common_audio:common_audio_neon ->
+    #   //webrtc/common_audio:common_audio
+    check_includes = false
     sources = [
       "fir_filter_neon.cc",
       "resampler/sinc_resampler_neon.cc",
@@ -248,6 +283,10 @@ if (rtc_build_with_neon) {
       suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
     }
 
+    deps = [
+      ":sinc_resampler",
+    ]
+
     public_deps = [
       ":common_audio_neon_c",
     ]
@@ -282,6 +321,10 @@ if (rtc_build_with_neon) {
       # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
       suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
     }
+    deps = [
+      ":common_audio_c",
+      "../base:rtc_base_approved",
+    ]
   }
 }
 
@@ -335,6 +378,10 @@ if (rtc_include_tests) {
 
     deps = [
       ":common_audio",
+      ":sinc_resampler",
+      "..:webrtc_common",
+      "../base:rtc_base_approved",
+      "../system_wrappers",
       "../test:test_main",
       "//testing/gmock",
       "//testing/gtest",