| Index: webrtc/sdk/BUILD.gn
|
| diff --git a/webrtc/sdk/BUILD.gn b/webrtc/sdk/BUILD.gn
|
| index 38c5b68de6b300ab0e1901b6ac24ace4377dfc1d..77a9f552a7e6871e23ff07ccc29802dcf5c3fc1f 100644
|
| --- a/webrtc/sdk/BUILD.gn
|
| +++ b/webrtc/sdk/BUILD.gn
|
| @@ -28,14 +28,6 @@ if (is_ios || is_mac) {
|
| }
|
|
|
| rtc_static_library("rtc_sdk_common_objc") {
|
| - deps = [
|
| - "../base:rtc_base",
|
| - ]
|
| - configs += [
|
| - "..:common_objc",
|
| - "//build/config/compiler:enable_arc",
|
| - ]
|
| - public_configs = [ ":rtc_sdk_common_objc_config" ]
|
| sources = [
|
| "objc/Framework/Classes/NSString+StdString.h",
|
| "objc/Framework/Classes/NSString+StdString.mm",
|
| @@ -58,6 +50,14 @@ if (is_ios || is_mac) {
|
| "objc/Framework/Headers/WebRTC/RTCSSLAdapter.h",
|
| "objc/Framework/Headers/WebRTC/RTCTracing.h",
|
| ]
|
| + configs += [
|
| + "..:common_objc",
|
| + "//build/config/compiler:enable_arc",
|
| + ]
|
| + public_configs = [ ":rtc_sdk_common_objc_config" ]
|
| + deps = [
|
| + "../base:rtc_base",
|
| + ]
|
| if (is_ios) {
|
| sources += [
|
| "objc/Framework/Classes/RTCCameraPreviewView.m",
|
| @@ -73,6 +73,7 @@ if (is_ios || is_mac) {
|
| "objc/Framework/Classes/Metal/RTCMTLNV12Renderer.mm",
|
| "objc/Framework/Classes/Metal/RTCMTLVideoView.m",
|
| ]
|
| + deps += [ "../api:video_frame_api" ]
|
| }
|
|
|
| libs = [ "AVFoundation.framework" ]
|
| @@ -194,8 +195,22 @@ if (is_ios || is_mac) {
|
| "objc/Framework/Headers/WebRTC/RTCVideoTrack.h",
|
| ]
|
|
|
| + configs += [
|
| + "..:common_objc",
|
| + "//build/config/compiler:enable_arc",
|
| + ]
|
| +
|
| + public_configs = [ ":rtc_sdk_common_objc_config" ]
|
| +
|
| deps = [
|
| ":webrtc_h264_video_toolbox",
|
| + "../api:video_frame_api",
|
| + "../base:rtc_base",
|
| + "../base:rtc_base_approved",
|
| + "../common_video",
|
| + "../media:rtc_media",
|
| + "../media:rtc_media_base",
|
| + "../system_wrappers",
|
| ]
|
|
|
| if (is_ios) {
|
| @@ -230,13 +245,6 @@ if (is_ios || is_mac) {
|
| ]
|
| }
|
|
|
| - configs += [
|
| - "..:common_objc",
|
| - "//build/config/compiler:enable_arc",
|
| - ]
|
| -
|
| - public_configs = [ ":rtc_sdk_common_objc_config" ]
|
| -
|
| 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" ]
|
| @@ -276,11 +284,6 @@ if (is_ios || is_mac) {
|
| sources += [ "objc/Framework/Classes/Metal/RTCMTLVideoView.m" ]
|
| }
|
| }
|
| - deps = [
|
| - ":rtc_sdk_peerconnection_objc",
|
| - "//third_party/ocmock",
|
| - "//webrtc/system_wrappers:system_wrappers_default",
|
| - ]
|
|
|
| # TODO(tkchin): Cleanup this warning.
|
| cflags = [ "-Wno-objc-property-no-attribute" ]
|
| @@ -291,6 +294,13 @@ if (is_ios || is_mac) {
|
| ldflags = [ "-ObjC" ]
|
|
|
| defines = [ "GTEST_RELATIVE_PATH" ]
|
| + deps = [
|
| + ":rtc_sdk_peerconnection_objc",
|
| + "../base:rtc_base_tests_utils",
|
| + "//third_party/ocmock",
|
| + "//webrtc/system_wrappers:system_wrappers_default",
|
| + ]
|
| +
|
| 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" ]
|
| @@ -358,6 +368,13 @@ if (is_ios || is_mac) {
|
| "@rpath/$output_name.framework/$output_name",
|
| ]
|
|
|
| + configs += [
|
| + "..:common_objc",
|
| + "//build/config/compiler:enable_arc",
|
| + ]
|
| +
|
| + public_configs = [ ":rtc_sdk_common_objc_config" ]
|
| +
|
| deps = [
|
| ":rtc_sdk_peerconnection_objc",
|
| "../system_wrappers:field_trial_default",
|
| @@ -373,13 +390,6 @@ if (is_ios || is_mac) {
|
| "VideoToolbox.framework",
|
| ]
|
|
|
| - configs += [
|
| - "..:common_objc",
|
| - "//build/config/compiler:enable_arc",
|
| - ]
|
| -
|
| - public_configs = [ ":rtc_sdk_common_objc_config" ]
|
| -
|
| if (!build_with_chromium && is_clang) {
|
| # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163)
|
| configs -= [ "//build/config/clang:find_bad_constructs" ]
|
| @@ -413,6 +423,13 @@ if (is_ios || is_mac) {
|
|
|
| deps = [
|
| ":rtc_sdk_common_objc",
|
| + "../api:video_frame_api",
|
| + "../base:rtc_base_approved",
|
| + "../common_video",
|
| + "../media:rtc_media_base",
|
| + "../modules/video_coding:video_coding_utility",
|
| + "../modules/video_coding:webrtc_h264",
|
| + "../system_wrappers",
|
| ]
|
|
|
| libs = [
|
|
|