Index: webrtc/sdk/BUILD.gn |
diff --git a/webrtc/sdk/BUILD.gn b/webrtc/sdk/BUILD.gn |
index d774fc63588297cd03313d106f8d5f0eff18a8c5..d1854461e4e207f6e4a504373d93aab76ad4dc96 100644 |
--- a/webrtc/sdk/BUILD.gn |
+++ b/webrtc/sdk/BUILD.gn |
@@ -80,6 +80,27 @@ if (is_ios || is_mac) { |
} |
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 Cla
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", |
@@ -366,16 +387,18 @@ if (is_ios || is_mac) { |
] |
# RTCMTLVideoView not supported on 32-bit arm |
kthelgason
2017/06/02 13:54:06
This comment now needs to be moved inside the if(i
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" ] |
@@ -389,6 +412,8 @@ if (is_ios || is_mac) { |
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", |
@@ -449,6 +474,7 @@ if (is_ios || is_mac) { |
] |
deps = [ |
+ ":objc_audio", |
":objc_peerconnection", |
":objc_ui", |
"../base:rtc_base_approved", |