Index: webrtc/sdk/BUILD.gn |
diff --git a/webrtc/sdk/BUILD.gn b/webrtc/sdk/BUILD.gn |
index 77a9f552a7e6871e23ff07ccc29802dcf5c3fc1f..721580d872875326f58ddfc2a29a58177a7f72f7 100644 |
--- a/webrtc/sdk/BUILD.gn |
+++ b/webrtc/sdk/BUILD.gn |
@@ -50,14 +50,12 @@ 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", |
] |
+ configs += [ "..:common_objc" ] |
+ |
+ public_configs = [ ":rtc_sdk_common_objc_config" ] |
if (is_ios) { |
sources += [ |
"objc/Framework/Classes/RTCCameraPreviewView.m", |
@@ -195,13 +193,6 @@ 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", |
@@ -245,6 +236,10 @@ if (is_ios || is_mac) { |
] |
} |
+ configs += [ "..:common_objc" ] |
+ |
+ 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" ] |
@@ -368,13 +363,6 @@ 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", |
@@ -390,6 +378,10 @@ if (is_ios || is_mac) { |
"VideoToolbox.framework", |
] |
+ configs += [ "..:common_objc" ] |
+ |
+ 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" ] |
@@ -416,10 +408,7 @@ if (is_ios || is_mac) { |
"objc/Framework/Classes/h264_video_toolbox_nalu.h", |
] |
- configs += [ |
- "//webrtc:common_objc", |
- "//build/config/compiler:enable_arc", |
- ] |
+ configs += [ "//webrtc:common_objc" ] |
deps = [ |
":rtc_sdk_common_objc", |