Split audio mixer into interface and implementation.

webrtc/modules/audio_mixer/BUILD.gn

Index: webrtc/modules/audio_mixer/BUILD.gn
diff --git a/webrtc/modules/audio_mixer/BUILD.gn b/webrtc/modules/audio_mixer/BUILD.gn
index 412b4d08f78a6e62665129eefb60ae1f04f893fa..c499e44bea333c7fdcc828be2f680b57c6d4987e 100644
--- a/webrtc/modules/audio_mixer/BUILD.gn
+++ b/webrtc/modules/audio_mixer/BUILD.gn
@@ -8,15 +8,12 @@
 
 import("../../build/webrtc.gni")
 
-config("audio_conference_mixer_config") {
-  include_dirs = [ "../../modules/include" ]
-}
-
-rtc_static_library("audio_mixer") {
+rtc_static_library("audio_mixer_impl") {
+  visibility = [
+    "../../audio:audio",
+    "../../modules/*",
+  ]
   sources = [
-    "audio_frame_manipulator.cc",
-    "audio_frame_manipulator.h",
-    "audio_mixer.h",
     "audio_mixer_impl.cc",
     "audio_mixer_impl.h",
     "audio_source_with_mix_status.cc",
@@ -24,17 +21,36 @@ rtc_static_library("audio_mixer") {
   ]
 
   public = [
-    "audio_mixer.h",
+    "audio_mixer_impl.h",
   ]
 
-  public_configs = [ ":audio_conference_mixer_config" ]
+  public_deps = [
+    "../../api:audio_mixer_api",
+  ]

[aleloi, 2016/10/13 09:25:23]

This way, targets that create the mixer and include the api do not need to
explicitly depend on it. Our situation seems to fit one of the cases described
in "gn help public_deps":

  Generally if you are writing a target B and you include C's headers
  as part of B's public headers, or targets depending on B should
  consider B and C to be part of a unit, you should use public_deps
  instead of deps.

(with B=audio_mixer_impl and C=audio_mixer_api)

 
   deps = [
+    ":audio_frame_manipulator",
     "../..:webrtc_common",
     "../../base:rtc_base_approved",
     "../../modules/audio_processing",
     "../../modules/utility",
     "../../system_wrappers",
-    "../../voice_engine:level_indicator",
+  ]
+}
+
+rtc_static_library("audio_frame_manipulator") {
+  visibility = [
+    ":*",
+    "../../modules:modules_unittests",
+  ]
+
+  sources = [
+    "audio_frame_manipulator.cc",
+    "audio_frame_manipulator.h",
+  ]
+
+  deps = [
+    "../../base:rtc_base_approved",
+    "../../modules/utility",
   ]
 }

[aleloi, 2016/10/13 09:25:23]

The mixer directory contains a test file called
audio_frame_manipulator_unittests.cc, which is part of the target
modules:modules_unittests. The unit test includes audio_frame_manipulator.h,
which was forbidden by GN's include header checker. It was forbidden, because
:audio_mixer_impl only declared audio_mixer_impl.h to be a public header.