diff options
author | Erwin Jansen <jansene@google.com> | 2021-06-23 05:52:25 -0700 |
---|---|---|
committer | Erwin Jansen <jansene@google.com> | 2021-06-23 06:45:54 -0700 |
commit | 16be34ae72cdb525c88c2b31b21b976f35fe36d8 (patch) | |
tree | 6eacaffe4bebf8e00c290c1e1839e084b0c52e88 /sdk/BUILD.gn | |
parent | 97e54a7e73c7b24e464ef06ef3c3b3716f21bb15 (diff) | |
parent | 49cb4599560d6005d5df0dadfca2db04b288f216 (diff) | |
download | webrtc-16be34ae72cdb525c88c2b31b21b976f35fe36d8.tar.gz |
Merge upstream-master and enable ARM64
We bring in the latest WebRTC changes and turn on arm.
This adds a new third party lib: crc32c, and includes a workaround
for handling a depencency issue for arm.
Bug: 191745658
Change-Id: Ic5be99911990ef14a5f733f19394032b20f85024
Diffstat (limited to 'sdk/BUILD.gn')
-rw-r--r-- | sdk/BUILD.gn | 110 |
1 files changed, 52 insertions, 58 deletions
diff --git a/sdk/BUILD.gn b/sdk/BUILD.gn index e01ab97a6e..e7d186aa4b 100644 --- a/sdk/BUILD.gn +++ b/sdk/BUILD.gn @@ -390,6 +390,7 @@ if (is_ios || is_mac) { "../api/video:video_rtp_headers", "../common_video", "../media:rtc_media_base", + "../pc:rtc_pc_base", "../rtc_base", "../rtc_base:checks", "../rtc_base:threading", @@ -487,7 +488,10 @@ if (is_ios || is_mac) { rtc_library("ui_objc") { visibility = [ "*" ] - allow_poison = [ "audio_codecs" ] # TODO(bugs.webrtc.org/8396): Remove. + allow_poison = [ + "audio_codecs", # TODO(bugs.webrtc.org/8396): Remove. + "default_task_queue", + ] if (is_ios) { sources = [ "objc/components/renderer/opengl/RTCDisplayLinkTimer.h", @@ -506,61 +510,60 @@ if (is_ios || is_mac) { deps = [ ":base_objc", ":helpers_objc", + ":metal_objc", ":video_objc", ":videocapture_objc", ":videoframebuffer_objc", ] } - if (rtc_use_metal_rendering) { - rtc_library("metal_objc") { - visibility = [ "*" ] - allow_poison = [ - "audio_codecs", # TODO(bugs.webrtc.org/8396): Remove. - "default_task_queue", - ] - sources = [ - "objc/components/renderer/metal/RTCMTLI420Renderer.h", - "objc/components/renderer/metal/RTCMTLI420Renderer.mm", - "objc/components/renderer/metal/RTCMTLRenderer+Private.h", - "objc/components/renderer/metal/RTCMTLRenderer.h", - "objc/components/renderer/metal/RTCMTLRenderer.mm", - ] - if (is_ios) { - sources += [ - "objc/components/renderer/metal/RTCMTLNV12Renderer.h", - "objc/components/renderer/metal/RTCMTLNV12Renderer.mm", - "objc/components/renderer/metal/RTCMTLRGBRenderer.h", - "objc/components/renderer/metal/RTCMTLRGBRenderer.mm", - "objc/components/renderer/metal/RTCMTLVideoView.h", - "objc/components/renderer/metal/RTCMTLVideoView.m", - ] - } - frameworks = [ - "CoreVideo.framework", - "Metal.framework", - "MetalKit.framework", + rtc_library("metal_objc") { + visibility = [ "*" ] + allow_poison = [ + "audio_codecs", # TODO(bugs.webrtc.org/8396): Remove. + "default_task_queue", + ] + sources = [ + "objc/components/renderer/metal/RTCMTLI420Renderer.h", + "objc/components/renderer/metal/RTCMTLI420Renderer.mm", + "objc/components/renderer/metal/RTCMTLNV12Renderer.h", + "objc/components/renderer/metal/RTCMTLNV12Renderer.mm", + "objc/components/renderer/metal/RTCMTLRGBRenderer.h", + "objc/components/renderer/metal/RTCMTLRGBRenderer.mm", + "objc/components/renderer/metal/RTCMTLRenderer+Private.h", + "objc/components/renderer/metal/RTCMTLRenderer.h", + "objc/components/renderer/metal/RTCMTLRenderer.mm", + ] + frameworks = [ + "CoreVideo.framework", + "Metal.framework", + "MetalKit.framework", + ] + if (is_ios) { + sources += [ + "objc/components/renderer/metal/RTCMTLVideoView.h", + "objc/components/renderer/metal/RTCMTLVideoView.m", ] - if (is_mac) { - sources += [ - "objc/components/renderer/metal/RTCMTLNSVideoView.h", - "objc/components/renderer/metal/RTCMTLNSVideoView.m", - ] - frameworks += [ "AppKit.framework" ] - } - deps = [ - ":base_objc", - ":peerconnectionfactory_base_objc", - ":video_objc", - ":videoframebuffer_objc", - "../api/video:video_frame", - "../api/video:video_rtp_headers", - "../rtc_base:checks", - "../rtc_base:rtc_base_approved", + } + if (is_mac) { + sources += [ + "objc/components/renderer/metal/RTCMTLNSVideoView.h", + "objc/components/renderer/metal/RTCMTLNSVideoView.m", ] - configs += [ "..:common_objc" ] - public_configs = [ ":common_config_objc" ] + frameworks += [ "AppKit.framework" ] } + deps = [ + ":base_objc", + ":peerconnectionfactory_base_objc", + ":video_objc", + ":videoframebuffer_objc", + "../api/video:video_frame", + "../api/video:video_rtp_headers", + "../rtc_base:checks", + "../rtc_base:rtc_base_approved", + ] + configs += [ "..:common_objc" ] + public_configs = [ ":common_config_objc" ] } # TODO(bugs.webrtc.org/9627): Remove this target. @@ -1026,6 +1029,7 @@ if (is_ios || is_mac) { "objc/unittests/RTCEncodedImage_xctest.mm", "objc/unittests/RTCFileVideoCapturer_xctest.mm", "objc/unittests/RTCH264ProfileLevelId_xctest.m", + "objc/unittests/RTCMTLVideoView_xctest.m", "objc/unittests/RTCNV12TextureCache_xctest.m", "objc/unittests/RTCPeerConnectionFactory_xctest.m", "objc/unittests/frame_buffer_helpers.h", @@ -1050,6 +1054,7 @@ if (is_ios || is_mac) { ":callback_logger_objc", ":framework_objc", ":mediaconstraints_objc", + ":metal_objc", ":native_api", ":native_api_audio_device_module", ":native_video", @@ -1073,11 +1078,6 @@ if (is_ios || is_mac) { "//third_party/libyuv", ] - if (rtc_use_metal_rendering) { - sources += [ "objc/unittests/RTCMTLVideoView_xctest.m" ] - deps += [ ":metal_objc" ] - } - public_deps = [ "//build/config/ios:xctest", "//third_party/ocmock", @@ -1318,9 +1318,6 @@ if (is_ios || is_mac) { ":videotoolbox_objc", "../rtc_base:rtc_base_approved", ] - if (rtc_use_metal_rendering) { - deps += [ ":metal_objc" ] - } if (!build_with_chromium) { deps += [ ":callback_logger_objc", @@ -1452,9 +1449,6 @@ if (is_ios || is_mac) { ":videotoolbox_objc", "../rtc_base:rtc_base_approved", ] - if (rtc_use_metal_rendering) { - deps += [ ":metal_objc" ] - } if (!build_with_chromium) { deps += [ ":callback_logger_objc", |