Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(88)

Side by Side Diff: webrtc/api/api.gyp

Issue 1696673003: Tweaks for new Objective-C API. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Changes based on feedback Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | webrtc/api/objc/RTCAVFoundationVideoSource.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2015 The WebRTC project authors. All Rights Reserved. 1 # Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
2 # 2 #
3 # Use of this source code is governed by a BSD-style license 3 # Use of this source code is governed by a BSD-style license
4 # that can be found in the LICENSE file in the root of the source 4 # that can be found in the LICENSE file in the root of the source
5 # tree. An additional intellectual property rights grant can be found 5 # tree. An additional intellectual property rights grant can be found
6 # in the file PATENTS. All contributing project authors may 6 # in the file PATENTS. All contributing project authors may
7 # be found in the AUTHORS file in the root of the source tree. 7 # be found in the AUTHORS file in the root of the source tree.
8 8
9 { 9 {
10 'includes': [ '../build/common.gypi', ], 10 'includes': [ '../build/common.gypi', ],
(...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after
187 'objc/RTCVideoRendererAdapter.mm', 187 'objc/RTCVideoRendererAdapter.mm',
188 'objc/RTCVideoSource+Private.h', 188 'objc/RTCVideoSource+Private.h',
189 'objc/RTCVideoSource.h', 189 'objc/RTCVideoSource.h',
190 'objc/RTCVideoSource.mm', 190 'objc/RTCVideoSource.mm',
191 'objc/RTCVideoTrack+Private.h', 191 'objc/RTCVideoTrack+Private.h',
192 'objc/RTCVideoTrack.h', 192 'objc/RTCVideoTrack.h',
193 'objc/RTCVideoTrack.mm', 193 'objc/RTCVideoTrack.mm',
194 'objc/avfoundationvideocapturer.h', 194 'objc/avfoundationvideocapturer.h',
195 'objc/avfoundationvideocapturer.mm', 195 'objc/avfoundationvideocapturer.mm',
196 ], 196 ],
197 'link_settings': {
tkchin_webrtc 2016/02/23 00:22:26 why do we need this?
hjon_webrtc 2016/02/23 21:06:12 Your question prompted me to dig into this again.
198 'libraries': [
199 '-lstdc++',
200 ],
201 },
197 'conditions': [ 202 'conditions': [
198 ['OS=="ios"', { 203 ['OS=="ios"', {
199 'sources': [ 204 'sources': [
200 'objc/RTCEAGLVideoView.h', 205 'objc/RTCEAGLVideoView.h',
201 'objc/RTCEAGLVideoView.m', 206 'objc/RTCEAGLVideoView.m',
202 ], 207 ],
203 'all_dependent_settings': { 208 'all_dependent_settings': {
204 'xcode_settings': { 209 'xcode_settings': {
205 'OTHER_LDFLAGS': [ 210 'OTHER_LDFLAGS': [
206 '-framework CoreGraphics', 211 '-framework CoreGraphics',
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after
353 'AdditionalOptions': [ 358 'AdditionalOptions': [
354 '-Wno-sign-compare', 359 '-Wno-sign-compare',
355 ], 360 ],
356 }, 361 },
357 }, 362 },
358 }], 363 }],
359 ], 364 ],
360 }, # target libjingle_peerconnection 365 }, # target libjingle_peerconnection
361 ], # targets 366 ], # targets
362 } 367 }
OLDNEW
« no previous file with comments | « no previous file | webrtc/api/objc/RTCAVFoundationVideoSource.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698