A simple copy of the old mixer to a new directory. I also plan to run 'git cl format'. In another C…

webrtc/modules/audio_mixer/BUILD.gn

Index: webrtc/modules/audio_mixer/BUILD.gn
diff --git a/webrtc/modules/audio_conference_mixer/BUILD.gn b/webrtc/modules/audio_mixer/BUILD.gn
similarity index 51%
copy from webrtc/modules/audio_conference_mixer/BUILD.gn
copy to webrtc/modules/audio_mixer/BUILD.gn
index 36391c7abcaad456b13d313324a0dc1c5cab7eed..c281f38023e3be0f713a3fb4d8df9919cfbe08cf 100644
--- a/webrtc/modules/audio_conference_mixer/BUILD.gn
+++ b/webrtc/modules/audio_mixer/BUILD.gn
@@ -10,23 +10,45 @@ config("audio_conference_mixer_config") {
   visibility = [ ":*" ]  # Only targets in this file can depend on this.
   include_dirs = [
     "include",
-    "../include",
+    "../../modules/include",
   ]
 }
 
+source_set("audio_mixer") {
+  sources = [
+    "audio_mixer.cc",
+    "audio_mixer.h",
+  ]
+  deps = [
+    ":audio_conference_mixer",
+    "../../voice_engine:voice_engine",
+  ]
+
+  if (is_win) {
+    defines = [ "WEBRTC_DRIFT_COMPENSATION_SUPPORTED" ]
+
+    cflags = [
+      # TODO(kjellander): Bug 261: fix this warning.
+      "/wd4373",  # virtual function override.
+    ]
+  }
+
+  configs += [ "../..:common_config" ]
+  public_configs = [ "../..:common_inherited_config" ]
+
+  if (is_clang) {
+    # Suppress warnings from Chrome's Clang plugins.
+    # See http://code.google.com/p/webrtc/issues/detail?id=163 for details.
+    configs -= [ "//build/config/clang:find_bad_constructs" ]
+  }
+}
+
 source_set("audio_conference_mixer") {
   sources = [
-    "include/audio_conference_mixer.h",
-    "include/audio_conference_mixer_defines.h",
-    "source/audio_conference_mixer_impl.cc",
-    "source/audio_conference_mixer_impl.h",
-    "source/audio_frame_manipulator.cc",
-    "source/audio_frame_manipulator.h",
-    "source/memory_pool.h",
-    "source/memory_pool_posix.h",
-    "source/memory_pool_win.h",
-    "source/time_scheduler.cc",
-    "source/time_scheduler.h",
+    "include/audio_mixer_defines.h",
+    "include/new_audio_conference_mixer.h",
+    "source/new_audio_conference_mixer_impl.cc",
+    "source/new_audio_conference_mixer_impl.h",
   ]
 
   configs += [ "../..:common_config" ]
@@ -43,8 +65,8 @@ source_set("audio_conference_mixer") {
   }
 
   deps = [
+    "../../modules/audio_processing",
+    "../../modules/utility",
     "../../system_wrappers",
-    "../audio_processing",
-    "../utility",
   ]
 }