Move RTCAudioSession* files modules/audio_device/ -> sdk/Framework.

webrtc/sdk/BUILD.gn

 # Copyright 2016 The WebRTC project authors. All Rights Reserved.
 #
 # Use of this source code is governed by a BSD-style license
 # that can be found in the LICENSE file in the root of the source
 # tree. An additional intellectual property rights grant can be found
 # in the file PATENTS.  All contributing project authors may
 # be found in the AUTHORS file in the root of the source tree.
 
 import("../webrtc.gni")
 if (is_ios) {
@@ skipping 62 matching lines @@
 
     if (!build_with_chromium) {
       sources += [
         "objc/Framework/Classes/Common/RTCFileLogger.mm",
         "objc/Framework/Headers/WebRTC/RTCFileLogger.h",
       ]
     }
   }
 
   if (!build_with_chromium) {
+    rtc_static_library("objc_audio") {
+      sources = [
+        "objc/Framework/Classes/RTCAudioSession+Configuration.mm",
+        "objc/Framework/Classes/RTCAudioSession+Private.h",
+        "objc/Framework/Classes/RTCAudioSession.mm",
+        "objc/Framework/Classes/RTCAudioSessionConfiguration.m",

[kthelgason, 2017/06/02 13:54:06]

Can you nest these in an "Audio" folder inside Classes?

[daniela-webrtc, 2017/06/02 14:16:44]

Done.

+        "objc/Framework/Headers/WebRTC/RTCAudioSession.h",
+        "objc/Framework/Headers/WebRTC/RTCAudioSessionConfiguration.h",
+      ]
+      configs += [ "..:common_objc" ]
+
+      deps = [
+        ":objc_common",
+        "../base:rtc_base_approved",
+      ]
+
+      if (is_clang) {
+        # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
+        suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
+      }
+    }
     rtc_static_library("objc_video") {
       sources = [
         "objc/Framework/Classes/Video/RTCAVFoundationVideoCapturerInternal.h",
         "objc/Framework/Classes/Video/RTCAVFoundationVideoCapturerInternal.mm",
         "objc/Framework/Classes/Video/RTCDefaultShader.h",
         "objc/Framework/Classes/Video/RTCDefaultShader.mm",
         "objc/Framework/Classes/Video/RTCI420TextureCache.h",
         "objc/Framework/Classes/Video/RTCI420TextureCache.mm",
         "objc/Framework/Classes/Video/RTCOpenGLDefines.h",
         "objc/Framework/Classes/Video/RTCShader.h",
@@ skipping 265 matching lines @@
 
         defines = [ "GTEST_RELATIVE_PATH" ]
         deps = [
           ":objc_peerconnection",
           "..//system_wrappers:system_wrappers_default",
           "../base:rtc_base_tests_utils",
           "../system_wrappers:system_wrappers_default",
           "//third_party/ocmock",
         ]
 
         # RTCMTLVideoView not supported on 32-bit arm

[kthelgason, 2017/06/02 13:54:06]

This comment now needs to be moved inside the if(is_ios)

[daniela-webrtc, 2017/06/02 14:16:44]

Done.

-        if (is_ios && current_cpu != "arm") {
-          sources += [ "objc/Framework/UnitTests/RTCMTLVideoViewTests.mm" ]
-          if (current_cpu != "arm64") {
-            # Only include this file on simulator, as it's already
-            # included in device builds.
-            sources += [ "objc/Framework/Classes/Metal/RTCMTLVideoView.m" ]
-            libs = [ "CoreVideo.framework" ]
+        if (is_ios) {
+          sources += [ "objc/Framework/UnitTests/RTCAudioSessionTest.mm" ]
+          if (current_cpu != "arm") {
+            sources += [ "objc/Framework/UnitTests/RTCMTLVideoViewTests.mm" ]
+            if (current_cpu != "arm64") {
+              # Only include this file on simulator, as it's already
+              # included in device builds.
+              sources += [ "objc/Framework/Classes/Metal/RTCMTLVideoView.m" ]
+              libs = [ "CoreVideo.framework" ]
+            }
           }
         }
-
         if (!build_with_chromium && is_clang) {
           # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
           suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
         }
       }
     }
 
     if (is_ios) {
       ios_framework_bundle("objc_framework") {
         info_plist = "objc/Framework/Info.plist"
         output_name = "WebRTC"
 
         common_objc_headers = [
+          "objc/Framework/Headers/WebRTC/RTCAudioSession.h",
+          "objc/Framework/Headers/WebRTC/RTCAudioSessionConfiguration.h",
           "objc/Framework/Headers/WebRTC/RTCAVFoundationVideoSource.h",
           "objc/Framework/Headers/WebRTC/RTCAudioSource.h",
           "objc/Framework/Headers/WebRTC/RTCAudioTrack.h",
           "objc/Framework/Headers/WebRTC/RTCCameraVideoCapturer.h",
           "objc/Framework/Headers/WebRTC/RTCCameraPreviewView.h",
           "objc/Framework/Headers/WebRTC/RTCConfiguration.h",
           "objc/Framework/Headers/WebRTC/RTCDataChannel.h",
           "objc/Framework/Headers/WebRTC/RTCDataChannelConfiguration.h",
           "objc/Framework/Headers/WebRTC/RTCDispatcher.h",
           "objc/Framework/Headers/WebRTC/RTCEAGLVideoView.h",
@@ skipping 40 matching lines @@
           public_headers += [ "objc/Framework/Headers/WebRTC/RTCFileLogger.h" ]
         }
 
         ldflags = [
           "-all_load",
           "-install_name",
           "@rpath/$output_name.framework/$output_name",
         ]
 
         deps = [
+          ":objc_audio",
           ":objc_peerconnection",
           ":objc_ui",
           "../base:rtc_base_approved",
           "../system_wrappers:field_trial_default",
           "../system_wrappers:metrics_default",
         ]
 
         libs = [
           "AVFoundation.framework",
           "CoreGraphics.framework",
@@ skipping 88 matching lines @@
         public_deps = [
           "$rtc_libyuv_dir",
         ]
       } else {
         # Need to add a directory normally exported by libyuv.
         include_dirs = [ "$rtc_libyuv_dir/include" ]
       }
     }
   }
 }