Chromium Code Reviews| Index: webrtc/sdk/sdk.gyp |
| diff --git a/webrtc/sdk/sdk.gyp b/webrtc/sdk/sdk.gyp |
| index 133ee310122b3d9cbb3be09fb946b0f0a4813c89..48142430beb4baf9e971ecced5e1fac74e7a9f97 100644 |
| --- a/webrtc/sdk/sdk.gyp |
| +++ b/webrtc/sdk/sdk.gyp |
| @@ -46,6 +46,13 @@ |
| 'objc/Framework/Headers/WebRTC/RTCSSLAdapter.h', |
| 'objc/Framework/Headers/WebRTC/RTCTracing.h', |
| ], |
| + 'link_settings': { |
|
tkchin_webrtc
2016/06/08 19:26:31
revert. AVFoundation is required by RTCCameraPrevi
|
| + 'xcode_settings': { |
| + 'OTHER_LDFLAGS': [ |
| + '-framework AVFoundation', |
| + ], |
| + }, |
| + }, |
| 'conditions': [ |
| ['OS=="ios"', { |
| 'sources': [ |
| @@ -54,13 +61,6 @@ |
| 'objc/Framework/Classes/RTCUIApplication.mm', |
| 'objc/Framework/Headers/WebRTC/RTCCameraPreviewView.h', |
| ], |
| - 'link_settings': { |
| - 'xcode_settings': { |
| - 'OTHER_LDFLAGS': [ |
| - '-framework AVFoundation', |
| - ], |
| - }, |
| - }, |
| }], # OS=="ios" |
| ['build_with_chromium==0', { |
| 'sources': [ |
| @@ -96,6 +96,8 @@ |
| 'sources': [ |
| 'objc/Framework/Classes/RTCAudioTrack+Private.h', |
| 'objc/Framework/Classes/RTCAudioTrack.mm', |
| + 'objc/Framework/Classes/RTCAVFoundationVideoSource+Private.h', |
| + 'objc/Framework/Classes/RTCAVFoundationVideoSource.mm', |
| 'objc/Framework/Classes/RTCConfiguration+Private.h', |
| 'objc/Framework/Classes/RTCConfiguration.mm', |
| 'objc/Framework/Classes/RTCDataChannel+Private.h', |
| @@ -143,7 +145,10 @@ |
| 'objc/Framework/Classes/RTCVideoSource.mm', |
| 'objc/Framework/Classes/RTCVideoTrack+Private.h', |
| 'objc/Framework/Classes/RTCVideoTrack.mm', |
| + 'objc/Framework/Classes/avfoundationvideocapturer.h', |
| + 'objc/Framework/Classes/avfoundationvideocapturer.mm', |
| 'objc/Framework/Headers/WebRTC/RTCAudioTrack.h', |
| + 'objc/Framework/Headers/WebRTC/RTCAVFoundationVideoSource.h', |
| 'objc/Framework/Headers/WebRTC/RTCConfiguration.h', |
| 'objc/Framework/Headers/WebRTC/RTCDataChannel.h', |
| 'objc/Framework/Headers/WebRTC/RTCDataChannelConfiguration.h', |
| @@ -169,12 +174,7 @@ |
| 'conditions': [ |
| ['OS=="ios"', { |
| 'sources': [ |
| - 'objc/Framework/Classes/RTCAVFoundationVideoSource+Private.h', |
| - 'objc/Framework/Classes/RTCAVFoundationVideoSource.mm', |
| 'objc/Framework/Classes/RTCEAGLVideoView.m', |
| - 'objc/Framework/Classes/avfoundationvideocapturer.h', |
| - 'objc/Framework/Classes/avfoundationvideocapturer.mm', |
| - 'objc/Framework/Headers/WebRTC/RTCAVFoundationVideoSource.h', |
| 'objc/Framework/Headers/WebRTC/RTCEAGLVideoView.h', |
| ], |
| 'link_settings': { |
| @@ -197,6 +197,7 @@ |
| 'xcode_settings': { |
| 'OTHER_LDFLAGS': [ |
| '-framework OpenGL', |
| + '-framework CoreMedia', |
|
tkchin_webrtc
2016/06/08 19:26:31
ooc what compiler warning do you get without CoreM
|
| ], |
| }, |
| }, |