| Index: webrtc/api/api.gyp
|
| diff --git a/webrtc/api/api.gyp b/webrtc/api/api.gyp
|
| index 3d47053ab4fec63621d1566e592d4733d77e630c..0341741e725dda0287a0bfa2d37d9640cb63aab5 100644
|
| --- a/webrtc/api/api.gyp
|
| +++ b/webrtc/api/api.gyp
|
| @@ -122,144 +122,6 @@
|
| }, # libjingle_peerconnection_java
|
| ]
|
| }],
|
| - ['OS=="ios" or (OS=="mac" and mac_deployment_target=="10.7")', {
|
| - 'targets': [
|
| - {
|
| - 'target_name': 'rtc_api_objc',
|
| - 'type': 'static_library',
|
| - 'includes': [
|
| - '../build/objc_common.gypi',
|
| - ],
|
| - 'dependencies': [
|
| - '<(webrtc_root)/base/base.gyp:rtc_base_objc',
|
| - 'libjingle_peerconnection',
|
| - ],
|
| - 'sources': [
|
| - 'objc/RTCAudioTrack+Private.h',
|
| - 'objc/RTCAudioTrack.h',
|
| - 'objc/RTCAudioTrack.mm',
|
| - 'objc/RTCConfiguration+Private.h',
|
| - 'objc/RTCConfiguration.h',
|
| - 'objc/RTCConfiguration.mm',
|
| - 'objc/RTCDataChannel+Private.h',
|
| - 'objc/RTCDataChannel.h',
|
| - 'objc/RTCDataChannel.mm',
|
| - 'objc/RTCDataChannelConfiguration+Private.h',
|
| - 'objc/RTCDataChannelConfiguration.h',
|
| - 'objc/RTCDataChannelConfiguration.mm',
|
| - 'objc/RTCIceCandidate+Private.h',
|
| - 'objc/RTCIceCandidate.h',
|
| - 'objc/RTCIceCandidate.mm',
|
| - 'objc/RTCIceServer+Private.h',
|
| - 'objc/RTCIceServer.h',
|
| - 'objc/RTCIceServer.mm',
|
| - 'objc/RTCMediaConstraints+Private.h',
|
| - 'objc/RTCMediaConstraints.h',
|
| - 'objc/RTCMediaConstraints.mm',
|
| - 'objc/RTCMediaStream+Private.h',
|
| - 'objc/RTCMediaStream.h',
|
| - 'objc/RTCMediaStream.mm',
|
| - 'objc/RTCMediaStreamTrack+Private.h',
|
| - 'objc/RTCMediaStreamTrack.h',
|
| - 'objc/RTCMediaStreamTrack.mm',
|
| - 'objc/RTCOpenGLVideoRenderer.h',
|
| - 'objc/RTCOpenGLVideoRenderer.mm',
|
| - 'objc/RTCPeerConnection+DataChannel.mm',
|
| - 'objc/RTCPeerConnection+Private.h',
|
| - 'objc/RTCPeerConnection+Stats.mm',
|
| - 'objc/RTCPeerConnection.h',
|
| - 'objc/RTCPeerConnection.mm',
|
| - 'objc/RTCPeerConnectionFactory+Private.h',
|
| - 'objc/RTCPeerConnectionFactory.h',
|
| - 'objc/RTCPeerConnectionFactory.mm',
|
| - 'objc/RTCRtpCodecParameters+Private.h',
|
| - 'objc/RTCRtpCodecParameters.h',
|
| - 'objc/RTCRtpCodecParameters.mm',
|
| - 'objc/RTCRtpEncodingParameters+Private.h',
|
| - 'objc/RTCRtpEncodingParameters.h',
|
| - 'objc/RTCRtpEncodingParameters.mm',
|
| - 'objc/RTCRtpParameters+Private.h',
|
| - 'objc/RTCRtpParameters.h',
|
| - 'objc/RTCRtpParameters.mm',
|
| - 'objc/RTCRtpSender+Private.h',
|
| - 'objc/RTCRtpSender.h',
|
| - 'objc/RTCRtpSender.mm',
|
| - 'objc/RTCSessionDescription+Private.h',
|
| - 'objc/RTCSessionDescription.h',
|
| - 'objc/RTCSessionDescription.mm',
|
| - 'objc/RTCStatsReport+Private.h',
|
| - 'objc/RTCStatsReport.h',
|
| - 'objc/RTCStatsReport.mm',
|
| - 'objc/RTCVideoFrame+Private.h',
|
| - 'objc/RTCVideoFrame.h',
|
| - 'objc/RTCVideoFrame.mm',
|
| - 'objc/RTCVideoRenderer.h',
|
| - 'objc/RTCVideoRendererAdapter+Private.h',
|
| - 'objc/RTCVideoRendererAdapter.h',
|
| - 'objc/RTCVideoRendererAdapter.mm',
|
| - 'objc/RTCVideoSource+Private.h',
|
| - 'objc/RTCVideoSource.h',
|
| - 'objc/RTCVideoSource.mm',
|
| - 'objc/RTCVideoTrack+Private.h',
|
| - 'objc/RTCVideoTrack.h',
|
| - 'objc/RTCVideoTrack.mm',
|
| - ],
|
| - # TODO(hjon): Make this compile without linking to libstdc++
|
| - # See https://bugs.chromium.org/p/webrtc/issues/detail?id=5593
|
| - 'link_settings': {
|
| - 'libraries': [
|
| - '-lstdc++',
|
| - ],
|
| - },
|
| - 'conditions': [
|
| - ['OS=="ios"', {
|
| - 'sources': [
|
| - 'objc/RTCAVFoundationVideoSource+Private.h',
|
| - 'objc/RTCAVFoundationVideoSource.h',
|
| - 'objc/RTCAVFoundationVideoSource.mm',
|
| - 'objc/RTCEAGLVideoView.h',
|
| - 'objc/RTCEAGLVideoView.m',
|
| - 'objc/avfoundationvideocapturer.h',
|
| - 'objc/avfoundationvideocapturer.mm',
|
| - ],
|
| - 'all_dependent_settings': {
|
| - 'xcode_settings': {
|
| - 'OTHER_LDFLAGS': [
|
| - '-framework CoreGraphics',
|
| - '-framework GLKit',
|
| - '-framework OpenGLES',
|
| - '-framework QuartzCore',
|
| - ]
|
| - }
|
| - },
|
| - # TODO(kjellander): Make the code compile without disabling these.
|
| - # See https://bugs.chromium.org/p/webrtc/issues/detail?id=3307
|
| - 'cflags': [
|
| - '-Wno-return-type',
|
| - ],
|
| - 'xcode_settings': {
|
| - 'WARNING_CFLAGS': [
|
| - '-Wno-return-type',
|
| - ],
|
| - },
|
| - }],
|
| - ['OS=="mac"', {
|
| - 'sources': [
|
| - 'objc/RTCNSGLVideoView.h',
|
| - 'objc/RTCNSGLVideoView.m',
|
| - ],
|
| - 'link_settings': {
|
| - 'xcode_settings': {
|
| - 'OTHER_LDFLAGS': [
|
| - '-framework OpenGL',
|
| - ],
|
| - },
|
| - },
|
| - }],
|
| - ],
|
| - }
|
| - ],
|
| - }], # OS=="ios"
|
| ], # conditions
|
| 'targets': [
|
| {
|
|
|