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

Side by Side Diff: webrtc/sdk/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
OLDNEW
1 # Copyright 2016 The WebRTC project authors. All Rights Reserved. 1 # Copyright 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_ios) { 10 if (is_ios) {
(...skipping 13 matching lines...) Expand all
24 include_dirs = [ 24 include_dirs = [
25 "objc/Framework/Classes", 25 "objc/Framework/Classes",
26 "objc/Framework/Headers", 26 "objc/Framework/Headers",
27 ] 27 ]
28 } 28 }
29 29
30 rtc_static_library("rtc_sdk_common_objc") { 30 rtc_static_library("rtc_sdk_common_objc") {
31 deps = [ 31 deps = [
32 "../base:rtc_base", 32 "../base:rtc_base",
33 ] 33 ]
34 configs += [ "..:common_objc" ] 34 configs += [
35 "..:common_objc",
36 "//build/config/compiler:enable_arc",
37 ]
35 public_configs = [ ":rtc_sdk_common_objc_config" ] 38 public_configs = [ ":rtc_sdk_common_objc_config" ]
36 sources = [ 39 sources = [
37 "objc/Framework/Classes/NSString+StdString.h", 40 "objc/Framework/Classes/NSString+StdString.h",
38 "objc/Framework/Classes/NSString+StdString.mm", 41 "objc/Framework/Classes/NSString+StdString.mm",
39 "objc/Framework/Classes/RTCDispatcher.m", 42 "objc/Framework/Classes/RTCDispatcher.m",
40 "objc/Framework/Classes/RTCFieldTrials.mm", 43 "objc/Framework/Classes/RTCFieldTrials.mm",
41 "objc/Framework/Classes/RTCLogging.mm", 44 "objc/Framework/Classes/RTCLogging.mm",
42 "objc/Framework/Classes/RTCMetrics.mm", 45 "objc/Framework/Classes/RTCMetrics.mm",
43 "objc/Framework/Classes/RTCMetricsSampleInfo+Private.h", 46 "objc/Framework/Classes/RTCMetricsSampleInfo+Private.h",
44 "objc/Framework/Classes/RTCMetricsSampleInfo.mm", 47 "objc/Framework/Classes/RTCMetricsSampleInfo.mm",
(...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after
213 sources += [ 216 sources += [
214 "objc/Framework/Classes/RTCNSGLVideoView.m", 217 "objc/Framework/Classes/RTCNSGLVideoView.m",
215 "objc/Framework/Headers/WebRTC/RTCNSGLVideoView.h", 218 "objc/Framework/Headers/WebRTC/RTCNSGLVideoView.h",
216 ] 219 ]
217 libs = [ 220 libs = [
218 "CoreMedia.framework", 221 "CoreMedia.framework",
219 "OpenGL.framework", 222 "OpenGL.framework",
220 ] 223 ]
221 } 224 }
222 225
223 configs += [ "..:common_objc" ] 226 configs += [
227 "..:common_objc",
228 "//build/config/compiler:enable_arc",
229 ]
224 230
225 public_configs = [ ":rtc_sdk_common_objc_config" ] 231 public_configs = [ ":rtc_sdk_common_objc_config" ]
226 232
227 if (!build_with_chromium && is_clang) { 233 if (!build_with_chromium && is_clang) {
228 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). 234 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
229 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] 235 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
230 } 236 }
231 237
232 libs += [ "AVFoundation.framework" ] 238 libs += [ "AVFoundation.framework" ]
233 239
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
352 358
353 libs = [ 359 libs = [
354 "AVFoundation.framework", 360 "AVFoundation.framework",
355 "AudioToolbox.framework", 361 "AudioToolbox.framework",
356 "CoreGraphics.framework", 362 "CoreGraphics.framework",
357 "CoreMedia.framework", 363 "CoreMedia.framework",
358 "GLKit.framework", 364 "GLKit.framework",
359 "VideoToolbox.framework", 365 "VideoToolbox.framework",
360 ] 366 ]
361 367
362 configs += [ "..:common_objc" ] 368 configs += [
369 "..:common_objc",
370 "//build/config/compiler:enable_arc",
371 ]
363 372
364 public_configs = [ ":rtc_sdk_common_objc_config" ] 373 public_configs = [ ":rtc_sdk_common_objc_config" ]
365 374
366 if (!build_with_chromium && is_clang) { 375 if (!build_with_chromium && is_clang) {
367 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163) 376 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163)
368 configs -= [ "//build/config/clang:find_bad_constructs" ] 377 configs -= [ "//build/config/clang:find_bad_constructs" ]
369 } 378 }
370 } 379 }
371 } 380 }
372 381
373 rtc_static_library("rtc_sdk_objc") { 382 rtc_static_library("rtc_sdk_objc") {
374 complete_static_lib = true 383 complete_static_lib = true
375 deps = [ 384 deps = [
376 ":rtc_sdk_peerconnection_objc", 385 ":rtc_sdk_peerconnection_objc",
377 "//webrtc/system_wrappers:field_trial_default", 386 "//webrtc/system_wrappers:field_trial_default",
378 "//webrtc/system_wrappers:metrics_default", 387 "//webrtc/system_wrappers:metrics_default",
379 ] 388 ]
380 } 389 }
381 390
382 rtc_static_library("webrtc_h264_video_toolbox") { 391 rtc_static_library("webrtc_h264_video_toolbox") {
383 sources = [ 392 sources = [
384 "objc/Framework/Classes/h264_video_toolbox_decoder.cc", 393 "objc/Framework/Classes/h264_video_toolbox_decoder.cc",
385 "objc/Framework/Classes/h264_video_toolbox_decoder.h", 394 "objc/Framework/Classes/h264_video_toolbox_decoder.h",
386 "objc/Framework/Classes/h264_video_toolbox_encoder.h", 395 "objc/Framework/Classes/h264_video_toolbox_encoder.h",
387 "objc/Framework/Classes/h264_video_toolbox_encoder.mm", 396 "objc/Framework/Classes/h264_video_toolbox_encoder.mm",
388 "objc/Framework/Classes/h264_video_toolbox_nalu.cc", 397 "objc/Framework/Classes/h264_video_toolbox_nalu.cc",
389 "objc/Framework/Classes/h264_video_toolbox_nalu.h", 398 "objc/Framework/Classes/h264_video_toolbox_nalu.h",
390 ] 399 ]
391 400
392 configs += [ "//webrtc:common_objc" ] 401 configs += [
402 "//webrtc:common_objc",
403 "//build/config/compiler:enable_arc",
404 ]
393 405
394 deps = [ 406 deps = [
395 ":rtc_sdk_common_objc", 407 ":rtc_sdk_common_objc",
396 ] 408 ]
397 409
398 libs = [ 410 libs = [
399 "CoreFoundation.framework", 411 "CoreFoundation.framework",
400 "CoreMedia.framework", 412 "CoreMedia.framework",
401 "CoreVideo.framework", 413 "CoreVideo.framework",
402 "VideoToolbox.framework", 414 "VideoToolbox.framework",
403 ] 415 ]
404 416
405 if (!build_with_chromium && is_clang) { 417 if (!build_with_chromium && is_clang) {
406 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). 418 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
407 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] 419 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
408 } 420 }
409 421
410 if (rtc_build_libyuv) { 422 if (rtc_build_libyuv) {
411 deps += [ "$rtc_libyuv_dir" ] 423 deps += [ "$rtc_libyuv_dir" ]
412 public_deps = [ 424 public_deps = [
413 "$rtc_libyuv_dir", 425 "$rtc_libyuv_dir",
414 ] 426 ]
415 } else { 427 } else {
416 # Need to add a directory normally exported by libyuv. 428 # Need to add a directory normally exported by libyuv.
417 include_dirs = [ "$rtc_libyuv_dir/include" ] 429 include_dirs = [ "$rtc_libyuv_dir/include" ]
418 } 430 }
419 } 431 }
420 } 432 }
OLDNEW
« no previous file with comments | « webrtc/modules/desktop_capture/mouse_cursor_monitor_mac.mm ('k') | webrtc/sdk/objc/Framework/UnitTests/avformatmappertests.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698