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

Side by Side Diff: webrtc/examples/BUILD.gn

Issue 2827223003: Revert of GN: Enable ARC for Mac and iOS in rtc_* templates (Closed)
Patch Set: Created 3 years, 8 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/modules/audio_device/BUILD.gn » ('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) 2016 The WebRTC project authors. All Rights Reserved. 1 # Copyright (c) 2016 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 import("../webrtc.gni") 9 import("../webrtc.gni")
10 if (is_android) { 10 if (is_android) {
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
153 config("apprtc_common_config") { 153 config("apprtc_common_config") {
154 include_dirs = [ "objc/AppRTCMobile/common" ] 154 include_dirs = [ "objc/AppRTCMobile/common" ]
155 } 155 }
156 156
157 rtc_static_library("apprtc_common") { 157 rtc_static_library("apprtc_common") {
158 testonly = true 158 testonly = true
159 sources = [ 159 sources = [
160 "objc/AppRTCMobile/common/ARDUtilities.h", 160 "objc/AppRTCMobile/common/ARDUtilities.h",
161 "objc/AppRTCMobile/common/ARDUtilities.m", 161 "objc/AppRTCMobile/common/ARDUtilities.m",
162 ] 162 ]
163 configs += [ "//build/config/compiler:enable_arc" ]
163 public_configs = [ ":apprtc_common_config" ] 164 public_configs = [ ":apprtc_common_config" ]
164 165
165 deps = [ 166 deps = [
166 "//webrtc/sdk:rtc_sdk_common_objc", 167 "//webrtc/sdk:rtc_sdk_common_objc",
167 "//webrtc/system_wrappers:field_trial_default", 168 "//webrtc/system_wrappers:field_trial_default",
168 "//webrtc/system_wrappers:metrics_default", 169 "//webrtc/system_wrappers:metrics_default",
169 ] 170 ]
170 } 171 }
171 172
172 config("apprtc_signaling_config") { 173 config("apprtc_signaling_config") {
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
217 "objc/AppRTCMobile/ARDWebSocketChannel.m", 218 "objc/AppRTCMobile/ARDWebSocketChannel.m",
218 "objc/AppRTCMobile/RTCIceCandidate+JSON.h", 219 "objc/AppRTCMobile/RTCIceCandidate+JSON.h",
219 "objc/AppRTCMobile/RTCIceCandidate+JSON.m", 220 "objc/AppRTCMobile/RTCIceCandidate+JSON.m",
220 "objc/AppRTCMobile/RTCIceServer+JSON.h", 221 "objc/AppRTCMobile/RTCIceServer+JSON.h",
221 "objc/AppRTCMobile/RTCIceServer+JSON.m", 222 "objc/AppRTCMobile/RTCIceServer+JSON.m",
222 "objc/AppRTCMobile/RTCMediaConstraints+JSON.h", 223 "objc/AppRTCMobile/RTCMediaConstraints+JSON.h",
223 "objc/AppRTCMobile/RTCMediaConstraints+JSON.m", 224 "objc/AppRTCMobile/RTCMediaConstraints+JSON.m",
224 "objc/AppRTCMobile/RTCSessionDescription+JSON.h", 225 "objc/AppRTCMobile/RTCSessionDescription+JSON.h",
225 "objc/AppRTCMobile/RTCSessionDescription+JSON.m", 226 "objc/AppRTCMobile/RTCSessionDescription+JSON.m",
226 ] 227 ]
228 configs += [ "//build/config/compiler:enable_arc" ]
227 public_configs = [ ":apprtc_signaling_config" ] 229 public_configs = [ ":apprtc_signaling_config" ]
228 deps = [ 230 deps = [
229 ":apprtc_common", 231 ":apprtc_common",
230 ":socketrocket", 232 ":socketrocket",
231 ] 233 ]
232 public_deps = [ 234 public_deps = [
233 "//webrtc/sdk:rtc_sdk_peerconnection_objc", 235 "//webrtc/sdk:rtc_sdk_peerconnection_objc",
234 ] 236 ]
235 libs = [ "QuartzCore.framework" ] 237 libs = [ "QuartzCore.framework" ]
236 } 238 }
(...skipping 12 matching lines...) Expand all
249 "objc/AppRTCMobile/ios/ARDStatsView.h", 251 "objc/AppRTCMobile/ios/ARDStatsView.h",
250 "objc/AppRTCMobile/ios/ARDStatsView.m", 252 "objc/AppRTCMobile/ios/ARDStatsView.m",
251 "objc/AppRTCMobile/ios/ARDVideoCallView.h", 253 "objc/AppRTCMobile/ios/ARDVideoCallView.h",
252 "objc/AppRTCMobile/ios/ARDVideoCallView.m", 254 "objc/AppRTCMobile/ios/ARDVideoCallView.m",
253 "objc/AppRTCMobile/ios/ARDVideoCallViewController.h", 255 "objc/AppRTCMobile/ios/ARDVideoCallViewController.h",
254 "objc/AppRTCMobile/ios/ARDVideoCallViewController.m", 256 "objc/AppRTCMobile/ios/ARDVideoCallViewController.m",
255 "objc/AppRTCMobile/ios/AppRTCMobile-Prefix.pch", 257 "objc/AppRTCMobile/ios/AppRTCMobile-Prefix.pch",
256 "objc/AppRTCMobile/ios/UIImage+ARDUtilities.h", 258 "objc/AppRTCMobile/ios/UIImage+ARDUtilities.h",
257 "objc/AppRTCMobile/ios/UIImage+ARDUtilities.m", 259 "objc/AppRTCMobile/ios/UIImage+ARDUtilities.m",
258 ] 260 ]
261 configs += [ "//build/config/compiler:enable_arc" ]
259 262
260 deps = [ 263 deps = [
261 ":apprtc_common", 264 ":apprtc_common",
262 ":apprtc_signaling", 265 ":apprtc_signaling",
263 "//webrtc/modules/audio_device", 266 "//webrtc/modules/audio_device",
264 ] 267 ]
265 } 268 }
266 269
267 ios_app_bundle("AppRTCMobile") { 270 ios_app_bundle("AppRTCMobile") {
268 testonly = true 271 testonly = true
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
325 328
326 if (is_mac) { 329 if (is_mac) {
327 rtc_static_library("AppRTCMobile_lib") { 330 rtc_static_library("AppRTCMobile_lib") {
328 testonly = true 331 testonly = true
329 sources = [ 332 sources = [
330 "objc/AppRTCMobile/mac/APPRTCAppDelegate.h", 333 "objc/AppRTCMobile/mac/APPRTCAppDelegate.h",
331 "objc/AppRTCMobile/mac/APPRTCAppDelegate.m", 334 "objc/AppRTCMobile/mac/APPRTCAppDelegate.m",
332 "objc/AppRTCMobile/mac/APPRTCViewController.h", 335 "objc/AppRTCMobile/mac/APPRTCViewController.h",
333 "objc/AppRTCMobile/mac/APPRTCViewController.m", 336 "objc/AppRTCMobile/mac/APPRTCViewController.m",
334 ] 337 ]
335 configs += [ "//webrtc:common_objc" ] 338 configs += [
339 "//webrtc:common_objc",
340 "//build/config/compiler:enable_arc",
341 ]
336 deps = [ 342 deps = [
337 ":apprtc_common", 343 ":apprtc_common",
338 ":apprtc_signaling", 344 ":apprtc_signaling",
339 ] 345 ]
340 } 346 }
341 347
342 mac_app_bundle("AppRTCMobile") { 348 mac_app_bundle("AppRTCMobile") {
343 testonly = true 349 testonly = true
344 output_name = "AppRTCMobile" 350 output_name = "AppRTCMobile"
345 351
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
379 "-Wno-objc-missing-property-synthesis", 385 "-Wno-objc-missing-property-synthesis",
380 ] 386 ]
381 } 387 }
382 388
383 rtc_static_library("socketrocket") { 389 rtc_static_library("socketrocket") {
384 testonly = true 390 testonly = true
385 sources = [ 391 sources = [
386 "objc/AppRTCMobile/third_party/SocketRocket/SRWebSocket.h", 392 "objc/AppRTCMobile/third_party/SocketRocket/SRWebSocket.h",
387 "objc/AppRTCMobile/third_party/SocketRocket/SRWebSocket.m", 393 "objc/AppRTCMobile/third_party/SocketRocket/SRWebSocket.m",
388 ] 394 ]
389 configs += [ ":socketrocket_warning_config" ] 395 configs += [
396 "//build/config/compiler:enable_arc",
397 ":socketrocket_warning_config",
398 ]
390 public_configs = [ ":socketrocket_include_config" ] 399 public_configs = [ ":socketrocket_include_config" ]
391 400
392 libs = [ 401 libs = [
393 "CFNetwork.framework", 402 "CFNetwork.framework",
394 "icucore", 403 "icucore",
395 ] 404 ]
396 } 405 }
397 406
398 if (rtc_include_tests) { 407 if (rtc_include_tests) {
399 # TODO(kthelgason): compile xctests on mac when chromium supports it. 408 # TODO(kthelgason): compile xctests on mac when chromium supports it.
(...skipping 12 matching lines...) Expand all
412 ] 421 ]
413 deps = [ 422 deps = [
414 "//webrtc/base:rtc_base", 423 "//webrtc/base:rtc_base",
415 ] 424 ]
416 public_deps = [ 425 public_deps = [
417 ":AppRTCMobile_ios_frameworks", 426 ":AppRTCMobile_ios_frameworks",
418 ":AppRTCMobile_lib", 427 ":AppRTCMobile_lib",
419 "//build/config/ios:xctest", 428 "//build/config/ios:xctest",
420 "//third_party/ocmock", 429 "//third_party/ocmock",
421 ] 430 ]
431 configs += [ "//build/config/compiler:enable_arc" ]
422 } 432 }
423 433
424 rtc_ios_xctest_test("apprtcmobile_tests") { 434 rtc_ios_xctest_test("apprtcmobile_tests") {
425 info_plist = "objc/AppRTCMobile/ios/Info.plist" 435 info_plist = "objc/AppRTCMobile/ios/Info.plist"
426 sources = [ 436 sources = [
427 "objc/AppRTCMobile/ios/main.m", 437 "objc/AppRTCMobile/ios/main.m",
428 ] 438 ]
429 deps = [ 439 deps = [
430 ":apprtcmobile_test_sources", 440 ":apprtcmobile_test_sources",
431 ] 441 ]
(...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after
619 629
620 deps = [ 630 deps = [
621 "../base:rtc_base", 631 "../base:rtc_base",
622 "../base:rtc_base_approved", 632 "../base:rtc_base_approved",
623 "../p2p:libstunprober", 633 "../p2p:libstunprober",
624 "../p2p:rtc_p2p", 634 "../p2p:rtc_p2p",
625 "../system_wrappers:field_trial_default", 635 "../system_wrappers:field_trial_default",
626 ] 636 ]
627 } 637 }
628 } 638 }
OLDNEW
« no previous file with comments | « no previous file | webrtc/modules/audio_device/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698