From 5fe4d496c034e9f2cae8e69c41b2a274f87b399d Mon Sep 17 00:00:00 2001 From: kthelgason Date: Mon, 5 Dec 2016 11:27:30 -0800 Subject: [PATCH] Remove unsupported mac framework target. We don't have a use case for it and have no reason to support it. BUG=webrtc:6706 Review-Url: https://codereview.webrtc.org/2543723004 Cr-Commit-Position: refs/heads/master@{#15428} --- webrtc/sdk/BUILD.gn | 127 ++++++++++++++------------------------------ 1 file changed, 41 insertions(+), 86 deletions(-) diff --git a/webrtc/sdk/BUILD.gn b/webrtc/sdk/BUILD.gn index 5340cddd35..542296439f 100644 --- a/webrtc/sdk/BUILD.gn +++ b/webrtc/sdk/BUILD.gn @@ -7,16 +7,12 @@ # be found in the AUTHORS file in the root of the source tree. import("../build/webrtc.gni") -if (is_mac) { - import("//build/config/mac/mac_sdk.gni") - import("//build/config/mac/rules.gni") -} if (is_ios) { import("//build/config/ios/rules.gni") } group("sdk") { - if (is_ios || is_mac) { + if (is_ios) { public_deps = [ ":rtc_sdk_framework_objc", ] @@ -231,93 +227,52 @@ if (is_ios || is_mac) { ] } } - common_objc_headers = [ - "objc/Framework/Headers/WebRTC/RTCAVFoundationVideoSource.h", - "objc/Framework/Headers/WebRTC/RTCAudioSource.h", - "objc/Framework/Headers/WebRTC/RTCAudioTrack.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", - "objc/Framework/Headers/WebRTC/RTCFieldTrials.h", - "objc/Framework/Headers/WebRTC/RTCIceCandidate.h", - "objc/Framework/Headers/WebRTC/RTCIceServer.h", - "objc/Framework/Headers/WebRTC/RTCLegacyStatsReport.h", - "objc/Framework/Headers/WebRTC/RTCLogging.h", - "objc/Framework/Headers/WebRTC/RTCMacros.h", - "objc/Framework/Headers/WebRTC/RTCMediaConstraints.h", - "objc/Framework/Headers/WebRTC/RTCMediaSource.h", - "objc/Framework/Headers/WebRTC/RTCMediaStream.h", - "objc/Framework/Headers/WebRTC/RTCMediaStreamTrack.h", - "objc/Framework/Headers/WebRTC/RTCMetrics.h", - "objc/Framework/Headers/WebRTC/RTCMetricsSampleInfo.h", - "objc/Framework/Headers/WebRTC/RTCPeerConnection.h", - "objc/Framework/Headers/WebRTC/RTCPeerConnectionFactory.h", - "objc/Framework/Headers/WebRTC/RTCRtpCodecParameters.h", - "objc/Framework/Headers/WebRTC/RTCRtpEncodingParameters.h", - "objc/Framework/Headers/WebRTC/RTCRtpParameters.h", - "objc/Framework/Headers/WebRTC/RTCRtpReceiver.h", - "objc/Framework/Headers/WebRTC/RTCRtpSender.h", - "objc/Framework/Headers/WebRTC/RTCSSLAdapter.h", - "objc/Framework/Headers/WebRTC/RTCSessionDescription.h", - "objc/Framework/Headers/WebRTC/RTCTracing.h", - "objc/Framework/Headers/WebRTC/RTCVideoFrame.h", - "objc/Framework/Headers/WebRTC/RTCVideoRenderer.h", - "objc/Framework/Headers/WebRTC/RTCVideoSource.h", - "objc/Framework/Headers/WebRTC/RTCVideoTrack.h", - "objc/Framework/Headers/WebRTC/UIDevice+RTCDevice.h", - "objc/Framework/Headers/WebRTC/WebRTC.h", - ] - if (is_mac) { - mac_framework_bundle("rtc_sdk_framework_objc") { - info_plist = "objc/Framework/Info.plist" - output_name = "WebRTC" - - sources = common_objc_headers + - [ "objc/Framework/Headers/WebRTC/RTCNSGLVideoView.h" ] - - if (!build_with_chromium) { - sources += [ "objc/Framework/Headers/WebRTC/RTCFileLogger.h" ] - } - - deps = [ - ":rtc_sdk_peerconnection_objc", - "../system_wrappers:field_trial_default", - "../system_wrappers:metrics_default", - ] - - libs = [ - "AVFoundation.framework", - "AudioToolbox.framework", - "CoreGraphics.framework", - "CoreMedia.framework", - "GLKit.framework", - "VideoToolbox.framework", - ] - - ldflags = [ "-all_load" ] - - 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" ] - } - } - } if (is_ios) { ios_framework_bundle("rtc_sdk_framework_objc") { info_plist = "objc/Framework/Info.plist" output_name = "WebRTC" + common_objc_headers = [ + "objc/Framework/Headers/WebRTC/RTCAVFoundationVideoSource.h", + "objc/Framework/Headers/WebRTC/RTCAudioSource.h", + "objc/Framework/Headers/WebRTC/RTCAudioTrack.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", + "objc/Framework/Headers/WebRTC/RTCFieldTrials.h", + "objc/Framework/Headers/WebRTC/RTCIceCandidate.h", + "objc/Framework/Headers/WebRTC/RTCIceServer.h", + "objc/Framework/Headers/WebRTC/RTCLegacyStatsReport.h", + "objc/Framework/Headers/WebRTC/RTCLogging.h", + "objc/Framework/Headers/WebRTC/RTCMacros.h", + "objc/Framework/Headers/WebRTC/RTCMediaConstraints.h", + "objc/Framework/Headers/WebRTC/RTCMediaSource.h", + "objc/Framework/Headers/WebRTC/RTCMediaStream.h", + "objc/Framework/Headers/WebRTC/RTCMediaStreamTrack.h", + "objc/Framework/Headers/WebRTC/RTCMetrics.h", + "objc/Framework/Headers/WebRTC/RTCMetricsSampleInfo.h", + "objc/Framework/Headers/WebRTC/RTCPeerConnection.h", + "objc/Framework/Headers/WebRTC/RTCPeerConnectionFactory.h", + "objc/Framework/Headers/WebRTC/RTCRtpCodecParameters.h", + "objc/Framework/Headers/WebRTC/RTCRtpEncodingParameters.h", + "objc/Framework/Headers/WebRTC/RTCRtpParameters.h", + "objc/Framework/Headers/WebRTC/RTCRtpReceiver.h", + "objc/Framework/Headers/WebRTC/RTCRtpSender.h", + "objc/Framework/Headers/WebRTC/RTCSSLAdapter.h", + "objc/Framework/Headers/WebRTC/RTCSessionDescription.h", + "objc/Framework/Headers/WebRTC/RTCTracing.h", + "objc/Framework/Headers/WebRTC/RTCVideoFrame.h", + "objc/Framework/Headers/WebRTC/RTCVideoRenderer.h", + "objc/Framework/Headers/WebRTC/RTCVideoSource.h", + "objc/Framework/Headers/WebRTC/RTCVideoTrack.h", + "objc/Framework/Headers/WebRTC/UIDevice+RTCDevice.h", + "objc/Framework/Headers/WebRTC/WebRTC.h", + ] + sources = common_objc_headers public_headers = common_objc_headers