Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 12 matching lines...) Expand all Loading... | |
| 23 config("rtc_sdk_common_objc_config") { | 23 config("rtc_sdk_common_objc_config") { |
| 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 "../system_wrappers:field_trial_default", | |
|
kjellander_webrtc
2017/04/12 14:37:04
I suspect this might cause problems for consumers
mbonadei
2017/04/13 08:12:03
The header 'system_wrappers/include/field_trial_de
| |
| 34 "../system_wrappers:metrics_default", | |
| 33 ] | 35 ] |
| 34 configs += [ | 36 configs += [ |
| 35 "..:common_objc", | 37 "..:common_objc", |
| 36 "//build/config/compiler:enable_arc", | 38 "//build/config/compiler:enable_arc", |
| 37 ] | 39 ] |
| 38 public_configs = [ ":rtc_sdk_common_objc_config" ] | 40 public_configs = [ ":rtc_sdk_common_objc_config" ] |
| 39 sources = [ | 41 sources = [ |
| 40 "objc/Framework/Classes/NSString+StdString.h", | 42 "objc/Framework/Classes/NSString+StdString.h", |
| 41 "objc/Framework/Classes/NSString+StdString.mm", | 43 "objc/Framework/Classes/NSString+StdString.mm", |
| 42 "objc/Framework/Classes/RTCDispatcher.m", | 44 "objc/Framework/Classes/RTCDispatcher.m", |
| (...skipping 23 matching lines...) Expand all Loading... | |
| 66 "objc/Framework/Classes/UIDevice+RTCDevice.mm", | 68 "objc/Framework/Classes/UIDevice+RTCDevice.mm", |
| 67 "objc/Framework/Headers/WebRTC/RTCCameraPreviewView.h", | 69 "objc/Framework/Headers/WebRTC/RTCCameraPreviewView.h", |
| 68 "objc/Framework/Headers/WebRTC/UIDevice+RTCDevice.h", | 70 "objc/Framework/Headers/WebRTC/UIDevice+RTCDevice.h", |
| 69 ] | 71 ] |
| 70 if (current_cpu == "arm64") { | 72 if (current_cpu == "arm64") { |
| 71 sources += [ | 73 sources += [ |
| 72 "objc/Framework/Classes/Metal/RTCMTLNV12Renderer.h", | 74 "objc/Framework/Classes/Metal/RTCMTLNV12Renderer.h", |
| 73 "objc/Framework/Classes/Metal/RTCMTLNV12Renderer.mm", | 75 "objc/Framework/Classes/Metal/RTCMTLNV12Renderer.mm", |
| 74 "objc/Framework/Classes/Metal/RTCMTLVideoView.m", | 76 "objc/Framework/Classes/Metal/RTCMTLVideoView.m", |
| 75 ] | 77 ] |
| 78 deps += [ "../api:video_frame_api" ] | |
| 76 } | 79 } |
| 77 | 80 |
| 78 libs = [ "AVFoundation.framework" ] | 81 libs = [ "AVFoundation.framework" ] |
| 79 if (current_cpu == "arm64") { | 82 if (current_cpu == "arm64") { |
| 80 libs += [ | 83 libs += [ |
| 81 "CoreVideo.framework", | 84 "CoreVideo.framework", |
| 82 "Metal.framework", | 85 "Metal.framework", |
| 83 "MetalKit.framework", | 86 "MetalKit.framework", |
| 84 ] | 87 ] |
| 85 } | 88 } |
| (...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 191 "objc/Framework/Headers/WebRTC/RTCSessionDescription.h", | 194 "objc/Framework/Headers/WebRTC/RTCSessionDescription.h", |
| 192 "objc/Framework/Headers/WebRTC/RTCVideoCapturer.h", | 195 "objc/Framework/Headers/WebRTC/RTCVideoCapturer.h", |
| 193 "objc/Framework/Headers/WebRTC/RTCVideoFrame.h", | 196 "objc/Framework/Headers/WebRTC/RTCVideoFrame.h", |
| 194 "objc/Framework/Headers/WebRTC/RTCVideoRenderer.h", | 197 "objc/Framework/Headers/WebRTC/RTCVideoRenderer.h", |
| 195 "objc/Framework/Headers/WebRTC/RTCVideoSource.h", | 198 "objc/Framework/Headers/WebRTC/RTCVideoSource.h", |
| 196 "objc/Framework/Headers/WebRTC/RTCVideoTrack.h", | 199 "objc/Framework/Headers/WebRTC/RTCVideoTrack.h", |
| 197 ] | 200 ] |
| 198 | 201 |
| 199 deps = [ | 202 deps = [ |
| 200 ":webrtc_h264_video_toolbox", | 203 ":webrtc_h264_video_toolbox", |
| 204 "../api:video_frame_api", | |
| 205 "../base:rtc_base", | |
| 206 "../base:rtc_base_approved", | |
| 207 "../common_video:common_video", | |
| 208 "../media:rtc_media", | |
| 209 "../media:rtc_media_base", | |
| 210 "../system_wrappers:system_wrappers", | |
| 201 ] | 211 ] |
| 202 | 212 |
| 203 if (is_ios) { | 213 if (is_ios) { |
| 204 sources += [ | 214 sources += [ |
| 205 "objc/Framework/Classes/RTCEAGLVideoView.m", | 215 "objc/Framework/Classes/RTCEAGLVideoView.m", |
| 206 "objc/Framework/Classes/RTCNativeNV12Shader.mm", | 216 "objc/Framework/Classes/RTCNativeNV12Shader.mm", |
| 207 "objc/Framework/Headers/WebRTC/RTCEAGLVideoView.h", | 217 "objc/Framework/Headers/WebRTC/RTCEAGLVideoView.h", |
| 208 ] | 218 ] |
| 209 libs = [ | 219 libs = [ |
| 210 "CoreGraphics.framework", | 220 "CoreGraphics.framework", |
| (...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 273 "objc/Framework/UnitTests/avformatmappertests.mm", | 283 "objc/Framework/UnitTests/avformatmappertests.mm", |
| 274 ] | 284 ] |
| 275 if (is_ios) { | 285 if (is_ios) { |
| 276 sources += [ "objc/Framework/UnitTests/RTCMTLVideoViewTests.mm" ] | 286 sources += [ "objc/Framework/UnitTests/RTCMTLVideoViewTests.mm" ] |
| 277 if (current_cpu != "arm64") { | 287 if (current_cpu != "arm64") { |
| 278 sources += [ "objc/Framework/Classes/Metal/RTCMTLVideoView.m" ] | 288 sources += [ "objc/Framework/Classes/Metal/RTCMTLVideoView.m" ] |
| 279 } | 289 } |
| 280 } | 290 } |
| 281 deps = [ | 291 deps = [ |
| 282 ":rtc_sdk_peerconnection_objc", | 292 ":rtc_sdk_peerconnection_objc", |
| 293 "../base:rtc_base_tests_utils", | |
| 283 "//third_party/ocmock", | 294 "//third_party/ocmock", |
| 284 "//webrtc/system_wrappers:system_wrappers_default", | 295 "//webrtc/system_wrappers:system_wrappers_default", |
| 285 ] | 296 ] |
| 286 | 297 |
| 287 # TODO(tkchin): Cleanup this warning. | 298 # TODO(tkchin): Cleanup this warning. |
| 288 cflags = [ "-Wno-objc-property-no-attribute" ] | 299 cflags = [ "-Wno-objc-property-no-attribute" ] |
| 289 | 300 |
| 290 # |-ObjC| flag needed to make sure category method implementations | 301 # |-ObjC| flag needed to make sure category method implementations |
| 291 # are included: | 302 # are included: |
| 292 # https://developer.apple.com/library/mac/qa/qa1490/_index.html | 303 # https://developer.apple.com/library/mac/qa/qa1490/_index.html |
| (...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 408 "objc/Framework/Classes/h264_video_toolbox_nalu.h", | 419 "objc/Framework/Classes/h264_video_toolbox_nalu.h", |
| 409 ] | 420 ] |
| 410 | 421 |
| 411 configs += [ | 422 configs += [ |
| 412 "//webrtc:common_objc", | 423 "//webrtc:common_objc", |
| 413 "//build/config/compiler:enable_arc", | 424 "//build/config/compiler:enable_arc", |
| 414 ] | 425 ] |
| 415 | 426 |
| 416 deps = [ | 427 deps = [ |
| 417 ":rtc_sdk_common_objc", | 428 ":rtc_sdk_common_objc", |
| 429 "../api:video_frame_api", | |
| 430 "../base:rtc_base_approved", | |
| 431 "../common_video:common_video", | |
|
kjellander_webrtc
2017/04/12 14:37:04
Leave out :common_video here for improved readabil
mbonadei
2017/04/13 08:12:03
Done.
| |
| 432 "../media:rtc_media_base", | |
| 433 "../modules/video_coding:video_coding_utility", | |
| 434 "../modules/video_coding:webrtc_h264", | |
| 435 "../system_wrappers:system_wrappers", | |
|
kjellander_webrtc
2017/04/12 14:37:04
You can leave out the :system_wrappers part.
mbonadei
2017/04/13 08:12:03
Done.
| |
| 418 ] | 436 ] |
| 419 | 437 |
| 420 libs = [ | 438 libs = [ |
| 421 "CoreFoundation.framework", | 439 "CoreFoundation.framework", |
| 422 "CoreMedia.framework", | 440 "CoreMedia.framework", |
| 423 "CoreVideo.framework", | 441 "CoreVideo.framework", |
| 424 "VideoToolbox.framework", | 442 "VideoToolbox.framework", |
| 425 ] | 443 ] |
| 426 | 444 |
| 427 if (!build_with_chromium && is_clang) { | 445 if (!build_with_chromium && is_clang) { |
| 428 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). | 446 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). |
| 429 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] | 447 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] |
| 430 } | 448 } |
| 431 | 449 |
| 432 if (rtc_build_libyuv) { | 450 if (rtc_build_libyuv) { |
| 433 deps += [ "$rtc_libyuv_dir" ] | 451 deps += [ "$rtc_libyuv_dir" ] |
| 434 public_deps = [ | 452 public_deps = [ |
| 435 "$rtc_libyuv_dir", | 453 "$rtc_libyuv_dir", |
| 436 ] | 454 ] |
| 437 } else { | 455 } else { |
| 438 # Need to add a directory normally exported by libyuv. | 456 # Need to add a directory normally exported by libyuv. |
| 439 include_dirs = [ "$rtc_libyuv_dir/include" ] | 457 include_dirs = [ "$rtc_libyuv_dir/include" ] |
| 440 } | 458 } |
| 441 } | 459 } |
| 442 } | 460 } |
| OLD | NEW |