admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Convert GN libs lists to frameworks

Browse Source 
GN recently added support for Apple frameworks to link, rather than
overloading the libs lists. This pulls .frameworks out of the libs
lists, so that GN can stop supporting .frameworks in libs in the
future.

Bug: chromium:1052560
Change-Id: I263230ddd3c468061584423bba9e1f887503bcaa
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/178601
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Commit-Queue: Sylvain Defresne <sdefresne@chromium.org>
Cr-Commit-Position: refs/heads/master@{#31632}
This commit is contained in:
Sylvain Defresne 2020-07-03 10:19:30 +02:00 committed by Commit Bot
parent d7d2f27b1b
commit c7f0dff191
9 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BUILD.gn
View File

@ -414,7 +414,7 @@ config("common_config") {
}
config("common_objc") {
libs = [ "Foundation.framework" ]
frameworks = [ "Foundation.framework" ]
if (rtc_use_metal_rendering) {
defines = [ "RTC_SUPPORTS_METAL" ]

14
examples/BUILD.gn
View File

@ -306,7 +306,7 @@ if (is_ios || (is_mac && target_cpu != "x86")) {
} else {
deps += [ "../sdk:mac_framework_objc+link" ]
}
libs = [
frameworks = [
"CoreMedia.framework",
"QuartzCore.framework",
]
@ -348,7 +348,7 @@ if (is_ios || (is_mac && target_cpu != "x86")) {
"../sdk:ios_framework_bundle",
]
libs = [ "AVFoundation.framework" ]
frameworks = [ "AVFoundation.framework" ]
}
ios_app_bundle("AppRTCMobile") {
@ -411,7 +411,7 @@ if (is_ios || (is_mac && target_cpu != "x86")) {
"../sdk:ios_framework_bundle",
]
libs = [ "ReplayKit.framework" ]
frameworks = [ "ReplayKit.framework" ]
}
ios_appex_bundle("AppRTCMobileBroadcastUpload") {
@ -435,7 +435,7 @@ if (is_ios || (is_mac && target_cpu != "x86")) {
info_plist = "objc/AppRTCMobile/ios/broadcast_extension/BroadcastSetupUIInfo.plist"
libs = [ "ReplayKit.framework" ]
frameworks = [ "ReplayKit.framework" ]
deps = [ ":AppRTCMobile_ios_bundle_data" ]
}
@ -549,7 +549,7 @@ if (is_ios || (is_mac && target_cpu != "x86")) {
info_plist = "objc/AppRTCMobile/mac/Info.plist"
libs = [ "AppKit.framework" ]
frameworks = [ "AppKit.framework" ]
ldflags = [
"-rpath",
@ -594,10 +594,10 @@ if (is_ios || (is_mac && target_cpu != "x86")) {
configs += [ ":socketrocket_warning_config" ]
public_configs = [ ":socketrocket_include_config" ]
libs = [
libs = [ "icucore" ]
frameworks = [
"CFNetwork.framework",
"Security.framework",
"icucore",
]
}

2
modules/audio_device/BUILD.gn
View File

@ -331,7 +331,7 @@ rtc_library("audio_device_impl") {
if (is_mac) {
rtc_source_set("audio_device_impl_frameworks") {
visibility = [ ":*" ]
libs = [
frameworks = [
# Needed for CoreGraphics:
"ApplicationServices.framework",

2
modules/desktop_capture/BUILD.gn
View File

@ -262,7 +262,7 @@ if (is_mac) {
"../../rtc_base/system:rtc_export",
"../../sdk:helpers_objc",
]
libs = [
frameworks = [
"AppKit.framework",
"IOKit.framework",
"IOSurface.framework",

2
modules/utility/BUILD.gn
View File

@ -26,7 +26,7 @@ rtc_library("utility") {
}
if (is_ios) {
libs = [ "AVFoundation.framework" ]
frameworks = [ "AVFoundation.framework" ]
}
deps = [

4
rtc_base/BUILD.gn
View File

@ -270,7 +270,7 @@ rtc_library("logging") {
deps += [ "system:inline" ]
if (is_mac) {
libs += [ "Foundation.framework" ]
frameworks = [ "Foundation.framework" ]
}
# logging.h needs the deprecation header while downstream projects are
@ -962,7 +962,7 @@ rtc_library("rtc_base") {
}
if (is_ios) {
libs += [
frameworks = [
"CFNetwork.framework",
"Foundation.framework",
"Security.framework",

2
rtc_base/system/BUILD.gn
View File

@ -58,7 +58,7 @@ if (is_mac || is_ios) {
"cocoa_threading.mm",
]
deps = [ "..:checks" ]
libs = [ "Foundation.framework" ]
frameworks = [ "Foundation.framework" ]
}
rtc_library("gcd_helpers") {

26
sdk/BUILD.gn
View File

@ -154,7 +154,7 @@ if (is_ios || is_mac) {
"../rtc_base:checks",
]
libs = [
frameworks = [
"AVFoundation.framework",
"CoreMedia.framework",
]
@ -275,7 +275,7 @@ if (is_ios || is_mac) {
]
absl_deps = [ "//third_party/abseil-cpp/absl/base:core_headers" ]
libs = [ "AudioToolbox.framework" ]
frameworks = [ "AudioToolbox.framework" ]
}
# This target exists to expose :audio_session_objc and
@ -327,7 +327,7 @@ if (is_ios || is_mac) {
public_configs = [ ":common_config_objc" ]
libs = [ "AVFoundation.framework" ]
frameworks = [ "AVFoundation.framework" ]
deps = [
":base_objc",
@ -394,7 +394,7 @@ if (is_ios || is_mac) {
"..:common_objc",
":used_from_extension",
]
libs = [
frameworks = [
"VideoToolbox.framework",
"CoreGraphics.framework",
"CoreVideo.framework",
@ -412,19 +412,19 @@ if (is_ios || is_mac) {
"objc/components/renderer/opengl/RTCShader.mm",
"objc/components/renderer/opengl/RTCVideoViewShading.h",
]
libs = [ "CoreVideo.framework" ]
frameworks = [ "CoreVideo.framework" ]
if (is_ios) {
sources += [
"objc/components/renderer/opengl/RTCNV12TextureCache.h",
"objc/components/renderer/opengl/RTCNV12TextureCache.m",
]
libs += [
frameworks += [
"GLKit.framework",
"OpenGLES.framework",
"QuartzCore.framework",
]
} else if (is_mac) {
libs += [
frameworks += [
"CoreMedia.framework",
"OpenGL.framework",
]
@ -504,7 +504,7 @@ if (is_ios || is_mac) {
"objc/components/renderer/metal/RTCMTLVideoView.m",
]
}
libs = [
frameworks = [
"CoreVideo.framework",
"Metal.framework",
"MetalKit.framework",
@ -514,7 +514,7 @@ if (is_ios || is_mac) {
"objc/components/renderer/metal/RTCMTLNSVideoView.h",
"objc/components/renderer/metal/RTCMTLNSVideoView.m",
]
libs += [ "AppKit.framework" ]
frameworks += [ "AppKit.framework" ]
}
deps = [
":base_objc",
@ -559,7 +559,7 @@ if (is_ios || is_mac) {
"objc/components/capturer/RTCFileVideoCapturer.m",
]
}
libs = [
frameworks = [
"AVFoundation.framework",
"CoreVideo.framework",
]
@ -1364,7 +1364,7 @@ if (is_ios || is_mac) {
]
}
libs = [
frameworks = [
"AVFoundation.framework",
"CoreGraphics.framework",
"CoreMedia.framework",
@ -1497,7 +1497,7 @@ if (is_ios || is_mac) {
]
}
libs = [
frameworks = [
"AVFoundation.framework",
"CoreGraphics.framework",
"CoreMedia.framework",
@ -1674,7 +1674,7 @@ if (is_ios || is_mac) {
"//third_party/libyuv",
]
libs = [
frameworks = [
"CoreFoundation.framework",
"CoreMedia.framework",
"CoreVideo.framework",

2
test/BUILD.gn
View File

@ -925,7 +925,7 @@ if (is_mac) {
":test_renderer_generic",
"../rtc_base:rtc_base_approved",
]
libs = [
frameworks = [
"Cocoa.framework",
"OpenGL.framework",
"CoreVideo.framework",