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

Side by Side Diff: webrtc/webrtc_examples.gyp

Issue 1690313002: Update iOS AppRTCDemo to use the updated Objective-C API. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Update against master Created 4 years, 9 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 | « webrtc/examples/objc/AppRTCDemo/tests/ARDAppClientTest.mm ('k') | no next file » | 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) 2012 The WebRTC Project Authors. All rights reserved. 1 # Copyright (c) 2012 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 'includes': [ 9 'includes': [
10 '../talk/build/common.gypi', 10 '../talk/build/common.gypi',
(...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after
147 }, # target peerconnection_client 147 }, # target peerconnection_client
148 ], # targets 148 ], # targets
149 }], # OS=="linux" or OS=="win" 149 }], # OS=="linux" or OS=="win"
150 150
151 ['OS=="ios" or (OS=="mac" and target_arch!="ia32")', { 151 ['OS=="ios" or (OS=="mac" and target_arch!="ia32")', {
152 'targets': [ 152 'targets': [
153 { 153 {
154 'target_name': 'apprtc_common', 154 'target_name': 'apprtc_common',
155 'type': 'static_library', 155 'type': 'static_library',
156 'dependencies': [ 156 'dependencies': [
157 '<(webrtc_root)/base/base.gyp:rtc_base_objc',
157 '<(webrtc_root)/system_wrappers/system_wrappers.gyp:field_trial_defa ult', 158 '<(webrtc_root)/system_wrappers/system_wrappers.gyp:field_trial_defa ult',
158 '../talk/app/webrtc/legacy_objc_api.gyp:libjingle_peerconnection_obj c',
159 ], 159 ],
160 'sources': [ 160 'sources': [
161 'examples/objc/AppRTCDemo/common/ARDUtilities.h', 161 'examples/objc/AppRTCDemo/common/ARDUtilities.h',
162 'examples/objc/AppRTCDemo/common/ARDUtilities.m', 162 'examples/objc/AppRTCDemo/common/ARDUtilities.m',
163 ], 163 ],
164 'include_dirs': [ 164 'include_dirs': [
165 'examples/objc/AppRTCDemo/common', 165 'examples/objc/AppRTCDemo/common',
166 ], 166 ],
167 'direct_dependent_settings': { 167 'direct_dependent_settings': {
168 'include_dirs': [ 168 'include_dirs': [
(...skipping 10 matching lines...) Expand all
179 '-Wno-deprecated-declarations', 179 '-Wno-deprecated-declarations',
180 ], 180 ],
181 }, 181 },
182 }], 182 }],
183 ['OS=="mac"', { 183 ['OS=="mac"', {
184 'xcode_settings': { 184 'xcode_settings': {
185 'MACOSX_DEPLOYMENT_TARGET' : '10.8', 185 'MACOSX_DEPLOYMENT_TARGET' : '10.8',
186 }, 186 },
187 }], 187 }],
188 ], 188 ],
189 'xcode_settings': {
190 'CLANG_ENABLE_OBJC_ARC': 'YES',
191 },
189 'link_settings': { 192 'link_settings': {
190 'xcode_settings': { 193 'xcode_settings': {
191 'OTHER_LDFLAGS': [ 194 'OTHER_LDFLAGS': [
192 '-framework QuartzCore', 195 '-framework QuartzCore',
193 ], 196 ],
194 }, 197 },
195 }, 198 },
196 }, 199 },
197 { 200 {
198 'target_name': 'apprtc_signaling', 201 'target_name': 'apprtc_signaling',
199 'type': 'static_library', 202 'type': 'static_library',
200 'dependencies': [ 203 'dependencies': [
204 '<(webrtc_root)/api/api.gyp:rtc_api_objc',
205 '<(webrtc_root)/base/base.gyp:rtc_base_objc',
201 'apprtc_common', 206 'apprtc_common',
202 'base/base.gyp:rtc_base_objc',
203 '../talk/app/webrtc/legacy_objc_api.gyp:libjingle_peerconnection_obj c',
204 'socketrocket', 207 'socketrocket',
205 ], 208 ],
206 'sources': [ 209 'sources': [
207 'examples/objc/AppRTCDemo/ARDAppClient.h', 210 'examples/objc/AppRTCDemo/ARDAppClient.h',
208 'examples/objc/AppRTCDemo/ARDAppClient.m', 211 'examples/objc/AppRTCDemo/ARDAppClient.m',
209 'examples/objc/AppRTCDemo/ARDAppClient+Internal.h', 212 'examples/objc/AppRTCDemo/ARDAppClient+Internal.h',
210 'examples/objc/AppRTCDemo/ARDAppEngineClient.h', 213 'examples/objc/AppRTCDemo/ARDAppEngineClient.h',
211 'examples/objc/AppRTCDemo/ARDAppEngineClient.m', 214 'examples/objc/AppRTCDemo/ARDAppEngineClient.m',
212 'examples/objc/AppRTCDemo/ARDBitrateTracker.h', 215 'examples/objc/AppRTCDemo/ARDBitrateTracker.h',
213 'examples/objc/AppRTCDemo/ARDBitrateTracker.m', 216 'examples/objc/AppRTCDemo/ARDBitrateTracker.m',
214 'examples/objc/AppRTCDemo/ARDCEODTURNClient.h', 217 'examples/objc/AppRTCDemo/ARDCEODTURNClient.h',
215 'examples/objc/AppRTCDemo/ARDCEODTURNClient.m', 218 'examples/objc/AppRTCDemo/ARDCEODTURNClient.m',
216 'examples/objc/AppRTCDemo/ARDJoinResponse.h', 219 'examples/objc/AppRTCDemo/ARDJoinResponse.h',
217 'examples/objc/AppRTCDemo/ARDJoinResponse.m', 220 'examples/objc/AppRTCDemo/ARDJoinResponse.m',
218 'examples/objc/AppRTCDemo/ARDJoinResponse+Internal.h', 221 'examples/objc/AppRTCDemo/ARDJoinResponse+Internal.h',
219 'examples/objc/AppRTCDemo/ARDMessageResponse.h', 222 'examples/objc/AppRTCDemo/ARDMessageResponse.h',
220 'examples/objc/AppRTCDemo/ARDMessageResponse.m', 223 'examples/objc/AppRTCDemo/ARDMessageResponse.m',
221 'examples/objc/AppRTCDemo/ARDMessageResponse+Internal.h', 224 'examples/objc/AppRTCDemo/ARDMessageResponse+Internal.h',
222 'examples/objc/AppRTCDemo/ARDRoomServerClient.h', 225 'examples/objc/AppRTCDemo/ARDRoomServerClient.h',
223 'examples/objc/AppRTCDemo/ARDSDPUtils.h', 226 'examples/objc/AppRTCDemo/ARDSDPUtils.h',
224 'examples/objc/AppRTCDemo/ARDSDPUtils.m', 227 'examples/objc/AppRTCDemo/ARDSDPUtils.m',
225 'examples/objc/AppRTCDemo/ARDSignalingChannel.h', 228 'examples/objc/AppRTCDemo/ARDSignalingChannel.h',
226 'examples/objc/AppRTCDemo/ARDSignalingMessage.h', 229 'examples/objc/AppRTCDemo/ARDSignalingMessage.h',
227 'examples/objc/AppRTCDemo/ARDSignalingMessage.m', 230 'examples/objc/AppRTCDemo/ARDSignalingMessage.m',
228 'examples/objc/AppRTCDemo/ARDStatsBuilder.h', 231 'examples/objc/AppRTCDemo/ARDStatsBuilder.h',
229 'examples/objc/AppRTCDemo/ARDStatsBuilder.m', 232 'examples/objc/AppRTCDemo/ARDStatsBuilder.m',
230 'examples/objc/AppRTCDemo/ARDTURNClient.h', 233 'examples/objc/AppRTCDemo/ARDTURNClient.h',
231 'examples/objc/AppRTCDemo/ARDWebSocketChannel.h', 234 'examples/objc/AppRTCDemo/ARDWebSocketChannel.h',
232 'examples/objc/AppRTCDemo/ARDWebSocketChannel.m', 235 'examples/objc/AppRTCDemo/ARDWebSocketChannel.m',
233 'examples/objc/AppRTCDemo/RTCICECandidate+JSON.h', 236 'examples/objc/AppRTCDemo/RTCIceCandidate+JSON.h',
234 'examples/objc/AppRTCDemo/RTCICECandidate+JSON.m', 237 'examples/objc/AppRTCDemo/RTCIceCandidate+JSON.m',
235 'examples/objc/AppRTCDemo/RTCICEServer+JSON.h', 238 'examples/objc/AppRTCDemo/RTCIceServer+JSON.h',
236 'examples/objc/AppRTCDemo/RTCICEServer+JSON.m', 239 'examples/objc/AppRTCDemo/RTCIceServer+JSON.m',
237 'examples/objc/AppRTCDemo/RTCMediaConstraints+JSON.h', 240 'examples/objc/AppRTCDemo/RTCMediaConstraints+JSON.h',
238 'examples/objc/AppRTCDemo/RTCMediaConstraints+JSON.m', 241 'examples/objc/AppRTCDemo/RTCMediaConstraints+JSON.m',
239 'examples/objc/AppRTCDemo/RTCSessionDescription+JSON.h', 242 'examples/objc/AppRTCDemo/RTCSessionDescription+JSON.h',
240 'examples/objc/AppRTCDemo/RTCSessionDescription+JSON.m', 243 'examples/objc/AppRTCDemo/RTCSessionDescription+JSON.m',
241 ], 244 ],
242 'include_dirs': [ 245 'include_dirs': [
243 'examples/objc/AppRTCDemo', 246 'examples/objc/AppRTCDemo',
244 ], 247 ],
245 'direct_dependent_settings': { 248 'direct_dependent_settings': {
246 'include_dirs': [ 249 'include_dirs': [
247 'examples/objc/AppRTCDemo', 250 'examples/objc/AppRTCDemo',
248 ], 251 ],
249 }, 252 },
250 'export_dependent_settings': [ 253 'export_dependent_settings': [
251 'base/base.gyp:rtc_base_objc', 254 '<(webrtc_root)/api/api.gyp:rtc_api_objc',
252 '../talk/app/webrtc/legacy_objc_api.gyp:libjingle_peerconnection_obj c',
253 ], 255 ],
254 'conditions': [ 256 'conditions': [
255 ['OS=="ios"', { 257 ['OS=="ios"', {
256 'xcode_settings': { 258 'xcode_settings': {
257 'WARNING_CFLAGS': [ 259 'WARNING_CFLAGS': [
258 # Suppress compiler warnings about deprecated that triggered 260 # Suppress compiler warnings about deprecated that triggered
259 # when moving from ios_deployment_target 7.0 to 9.0. 261 # when moving from ios_deployment_target 7.0 to 9.0.
260 # See webrtc:5549 for more details. 262 # See webrtc:5549 for more details.
261 '-Wno-deprecated-declarations', 263 '-Wno-deprecated-declarations',
262 ], 264 ],
263 }, 265 },
264 }], 266 }],
265 ['OS=="mac"', { 267 ['OS=="mac"', {
266 'xcode_settings': { 268 'xcode_settings': {
267 'MACOSX_DEPLOYMENT_TARGET' : '10.8', 269 'MACOSX_DEPLOYMENT_TARGET' : '10.8',
268 }, 270 },
269 }], 271 }],
270 ], 272 ],
273 'xcode_settings': {
274 'CLANG_ENABLE_OBJC_ARC': 'YES',
275 },
271 }, 276 },
272 { 277 {
273 'target_name': 'AppRTCDemo', 278 'target_name': 'AppRTCDemo',
274 'type': 'executable', 279 'type': 'executable',
275 'product_name': 'AppRTCDemo', 280 'product_name': 'AppRTCDemo',
276 'mac_bundle': 1, 281 'mac_bundle': 1,
277 'dependencies': [ 282 'dependencies': [
278 'apprtc_common', 283 'apprtc_common',
279 'apprtc_signaling', 284 'apprtc_signaling',
280 ], 285 ],
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
340 '-framework AVFoundation', 345 '-framework AVFoundation',
341 ], 346 ],
342 }, 347 },
343 }], 348 }],
344 ['target_arch=="ia32"', { 349 ['target_arch=="ia32"', {
345 'dependencies' : [ 350 'dependencies' : [
346 '<(DEPTH)/testing/iossim/iossim.gyp:iossim#host', 351 '<(DEPTH)/testing/iossim/iossim.gyp:iossim#host',
347 ], 352 ],
348 }], 353 }],
349 ], 354 ],
355 'xcode_settings': {
356 'CLANG_ENABLE_OBJC_ARC': 'YES',
357 },
350 }, # target AppRTCDemo 358 }, # target AppRTCDemo
351 { 359 {
352 # TODO(tkchin): move this into the real third party location and 360 # TODO(tkchin): move this into the real third party location and
353 # have it mirrored on chrome infra. 361 # have it mirrored on chrome infra.
354 'target_name': 'socketrocket', 362 'target_name': 'socketrocket',
355 'type': 'static_library', 363 'type': 'static_library',
356 'sources': [ 364 'sources': [
357 'examples/objc/AppRTCDemo/third_party/SocketRocket/SRWebSocket.h', 365 'examples/objc/AppRTCDemo/third_party/SocketRocket/SRWebSocket.h',
358 'examples/objc/AppRTCDemo/third_party/SocketRocket/SRWebSocket.m', 366 'examples/objc/AppRTCDemo/third_party/SocketRocket/SRWebSocket.m',
359 ], 367 ],
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
446 'apk_name': 'AppRTCDemoTest', 454 'apk_name': 'AppRTCDemoTest',
447 'java_in_dir': 'examples/androidtests', 455 'java_in_dir': 'examples/androidtests',
448 'is_test_apk': 1, 456 'is_test_apk': 1,
449 }, 457 },
450 'includes': [ '../build/java_apk.gypi' ], 458 'includes': [ '../build/java_apk.gypi' ],
451 }, 459 },
452 ], # targets 460 ], # targets
453 }], # OS=="android" 461 }], # OS=="android"
454 ], 462 ],
455 } 463 }
OLDNEW
« no previous file with comments | « webrtc/examples/objc/AppRTCDemo/tests/ARDAppClientTest.mm ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698