| 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..26adcf83d06bed17f897af717d9cab3584d07963 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", | 
| +  ] | 
|  | 
| 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:*", | 
| +  ] | 
| + | 
| +  sources = [ | 
| +    "audio_frame_manipulator.cc", | 
| +    "audio_frame_manipulator.h", | 
| +  ] | 
| + | 
| +  deps = [ | 
| +    "../../base:rtc_base_approved", | 
| +    "../../modules/utility", | 
| ] | 
| } | 
|  |