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

Don't use all_dependent_configs for sdk frameworks

Browse Source 
libs should be propagated to the final binary even without that:
https://gn.googlesource.com/gn/+/master/docs/reference.md#var_libs

But add some missing SDK framework dependencies:

* RTCNativeI420Buffer.mm uses CGBitmapContextGetBytesPerRow.
* socketrocket uses SecCertificateCopyData.

Bug: None
Change-Id: Iba38a5dfaf470a5a790d494cbec8ade44b1d16ba
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/146082
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Commit-Queue: Oleh Prypin <oprypin@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#28605}
This commit is contained in:
Oleh Prypin 2019-07-18 22:25:48 +02:00 committed by Commit Bot
parent 1a49c13388
commit 63741c7fa1
3 changed files with 18 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
examples/BUILD.gn
View File

@ -583,6 +583,7 @@ if (is_ios || (is_mac && target_cpu != "x86")) {
libs = [ libs = [
"CFNetwork.framework", "CFNetwork.framework",
"Security.framework",
"icucore", "icucore",
] ]
} }

39
rtc_base/BUILD.gn
View File

@ -19,27 +19,6 @@ config("rtc_base_chromium_config") {
defines = [ "NO_MAIN_THREAD_WRAPPING" ] defines = [ "NO_MAIN_THREAD_WRAPPING" ]
} }
config("rtc_base_all_dependent_config") {
if (is_ios) {
libs = [
"CFNetwork.framework",
"Foundation.framework",
"Security.framework",
"SystemConfiguration.framework",
"UIKit.framework",
]
}
if (is_mac) {
libs = [
"Cocoa.framework",
"Foundation.framework",
"IOKit.framework",
"Security.framework",
"SystemConfiguration.framework",
]
}
}
if (!rtc_build_ssl) { if (!rtc_build_ssl) {
config("external_ssl_library") { config("external_ssl_library") {
assert(rtc_ssl_root != "", assert(rtc_ssl_root != "",
@ -794,8 +773,6 @@ rtc_static_library("rtc_base") {
] ]
public_configs = [] public_configs = []
all_dependent_configs = [ ":rtc_base_all_dependent_config" ]
sources = [ sources = [
"async_invoker.cc", "async_invoker.cc",
"async_invoker.h", "async_invoker.h",
@ -961,6 +938,22 @@ rtc_static_library("rtc_base") {
"mac_utils.cc", "mac_utils.cc",
"mac_utils.h", "mac_utils.h",
] ]
libs += [
"Cocoa.framework",
"Foundation.framework",
"IOKit.framework",
"Security.framework",
"SystemConfiguration.framework",
]
}
if (is_ios) {
libs += [
"CFNetwork.framework",
"Foundation.framework",
"Security.framework",
"SystemConfiguration.framework",
"UIKit.framework",
]
} }
if (is_win) { if (is_win) {

1
sdk/BUILD.gn
View File

@ -373,6 +373,7 @@ if (is_ios || is_mac) {
] ]
libs = [ libs = [
"VideoToolbox.framework", "VideoToolbox.framework",
"CoreGraphics.framework",
"CoreVideo.framework", "CoreVideo.framework",
] ]
} }