Chromium Code Reviews| Index: webrtc/sdk/BUILD.gn |
| diff --git a/webrtc/sdk/BUILD.gn b/webrtc/sdk/BUILD.gn |
| index 2f81e11bd2b212b34c254b91f38affa9e5c350ee..4b96aae0d9a66c03c14c33b2e4050974fed1994b 100644 |
| --- a/webrtc/sdk/BUILD.gn |
| +++ b/webrtc/sdk/BUILD.gn |
| @@ -208,8 +208,11 @@ if (is_ios || is_mac) { |
| configs += [ "..:common_objc" ] |
| deps = [ |
| ":objc_common", |
| - ":objc_peerconnection", |
| + ":objc_video", |
| ] |
| + if (rtc_use_metal_rendering) { |
| + deps += [ ":objc_metal" ] |
| + } |
| } |
| if (rtc_use_metal_rendering) { |
| @@ -250,23 +253,19 @@ if (is_ios || is_mac) { |
| } |
| } |
| - rtc_static_library("objc_peerconnection") { |
| + rtc_static_library("objc_videocapture") { |
| sources = [ |
| - "objc/Framework/Classes/PeerConnection/RTCCameraVideoCapturer.m", |
| + "objc/Framework/Classes/VideoCapture/RTCCameraVideoCapturer.m", |
| "objc/Framework/Headers/WebRTC/RTCCameraVideoCapturer.h", |
| ] |
| if (is_ios) { |
| sources += [ |
| - "objc/Framework/Classes/PeerConnection/RTCFileVideoCapturer.h", |
| - "objc/Framework/Classes/PeerConnection/RTCFileVideoCapturer.m", |
| + "objc/Framework/Classes/VideoCapture/RTCFileVideoCapturer.h", |
| + "objc/Framework/Classes/VideoCapture/RTCFileVideoCapturer.m", |
| ] |
| } |
| libs = [ "AVFoundation.framework" ] |
| - if (is_ios) { |
| - libs += [ "CoreGraphics.framework" ] |
| - } |
| - |
| configs += [ "..:common_objc" ] |
| public_configs = [ ":objc_common_config" ] |
| @@ -279,25 +278,8 @@ if (is_ios || is_mac) { |
| deps = [ |
| ":objc_common", |
| - ":objc_corevideoframebuffer", |
| - ":objc_peerconnectionfactory", |
| - ":objc_video", |
| - "../api:video_frame_api", |
| - "../media:rtc_media_base", |
| - "../pc:libjingle_peerconnection", |
| - "../rtc_base:rtc_base", |
| + ":objc_peerconnectionfactory_base", |
| ] |
| - |
| - if (rtc_use_metal_rendering) { |
| - deps += [ ":objc_metal" ] |
| - } |
| - |
| - if (rtc_build_libyuv) { |
| - deps += [ "$rtc_libyuv_dir" ] |
| - public_deps = [ |
| - "$rtc_libyuv_dir", |
| - ] |
| - } |
| } |
| rtc_static_library("objc_peerconnectionfactory") { |
| @@ -319,7 +301,6 @@ if (is_ios || is_mac) { |
| ":objc_common", |
| ":objc_corevideoframebuffer", |
| ":objc_peerconnectionfactory_base", |
| - ":objc_video", |
|
daniela-webrtc
2017/08/01 08:35:08
Is this removed intentionally?
|
| ":objc_videotoolbox", |
| ":objc_videotracksource", |
| "../api:video_frame_api", |
| @@ -522,8 +503,9 @@ if (is_ios || is_mac) { |
| defines = [ "GTEST_RELATIVE_PATH" ] |
| deps = [ |
| - ":objc_peerconnection", |
| ":objc_peerconnectionfactory", |
| + ":objc_ui", |
| + ":objc_videocapture", |
| ":objc_videotoolbox", |
| ":objc_videotracksource", |
| "..//system_wrappers:system_wrappers_default", |
| @@ -628,8 +610,9 @@ if (is_ios || is_mac) { |
| deps = [ |
| ":objc_audio", |
| - ":objc_peerconnection", |
| + ":objc_peerconnectionfactory", |
| ":objc_ui", |
| + ":objc_videocapture", |
| "../rtc_base:rtc_base_approved", |
| "../system_wrappers:field_trial_default", |
| "../system_wrappers:metrics_default", |
| @@ -657,8 +640,10 @@ if (is_ios || is_mac) { |
| rtc_static_library("rtc_sdk_objc") { |
| complete_static_lib = true |
| deps = [ |
| - ":objc_peerconnection", |
| + ":objc_audio", |
| + ":objc_peerconnectionfactory", |
| ":objc_ui", |
| + ":objc_videocapture", |
| "../system_wrappers:field_trial_default", |
| "../system_wrappers:metrics_default", |
| ] |