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

Revert "Don't use all_dependent_configs for sdk frameworks"

Browse Source 
This reverts commit 63741c7fa1aa55a38af11ac8cc04498722f9407d.

Reason for revert: It breaks a chromium.fyi bot (https://ci.chromium.org/p/chromium/builders/webrtc.fyi/WebRTC%20Chromium%20FYI%20Mac%20Builder%20(dbg)/3974)

Original change's description:
> Don't use all_dependent_configs for sdk frameworks
> 
> 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}

TBR=mbonadei@webrtc.org,oprypin@webrtc.org

# Not skipping CQ checks because original CL landed > 1 day ago.

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

1
examples/BUILD.gn
View File

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

39
rtc_base/BUILD.gn
View File

@ -19,6 +19,27 @@ config("rtc_base_chromium_config") {
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) {
config("external_ssl_library") {
assert(rtc_ssl_root != "",
@ -771,6 +792,8 @@ rtc_static_library("rtc_base") {
]
public_configs = []
all_dependent_configs = [ ":rtc_base_all_dependent_config" ]
sources = [
"async_invoker.cc",
"async_invoker.h",
@ -936,22 +959,6 @@ rtc_static_library("rtc_base") {
"mac_utils.cc",
"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) {

1
sdk/BUILD.gn
View File

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