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

Restore BoringSSL behavior for webrtc/base/BUILD.gn

Browse Source 
In https://codereview.webrtc.org/1857163003 the openssl*
sources and the dependency on BoringSSL was moved out of
the use_openssl condition to make it similar to the GYP build.
Unfortunately this had unexpected side effects for the Chromium
build. See the referenced bug for more details.

This CL also fixes an incorrect move of the :ios_config dependency
that was spotted in https://codereview.webrtc.org/1857163003.

BUG=chromium:601042
R=perkj@webrtc.org, torbjorng@webrtc.org

Review URL: https://codereview.webrtc.org/1862123002 .

Cr-Commit-Position: refs/heads/master@{#12264}
This commit is contained in:
kjellander@webrtc.org 2016-04-06 17:18:36 +02:00
parent 8a89454610
commit d31b664a6c
1 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
webrtc/base/BUILD.gn
View File

@ -275,15 +275,6 @@ static_library("rtc_base") {
"networkmonitor.cc",
"networkmonitor.h",
"nullsocketserver.h",
"openssl.h",
"openssladapter.cc",
"openssladapter.h",
"openssldigest.cc",
"openssldigest.h",
"opensslidentity.cc",
"opensslidentity.h",
"opensslstreamadapter.cc",
"opensslstreamadapter.h",
"pathutils.cc",
"pathutils.h",
"physicalsocketserver.cc",
@ -472,10 +463,26 @@ static_library("rtc_base") {
cflags_cc += [ "-Wno-non-virtual-dtor" ]
}
if (rtc_build_ssl) {
deps += [ "//third_party/boringssl" ]
} else {
configs += [ "external_ssl_library" ]
# TODO(kjellander): The use_openssl block should really go away in order for
# the GN build to be similar to the GYP build. See http://crbug.com/601042 for
# more details.
if (use_openssl) {
if (rtc_build_ssl) {
deps += [ "//third_party/boringssl" ]
} else {
configs += [ "external_ssl_library" ]
}
sources += [
"openssl.h",
"openssladapter.cc",
"openssladapter.h",
"openssldigest.cc",
"openssldigest.h",
"opensslidentity.cc",
"opensslidentity.h",
"opensslstreamadapter.cc",
"opensslstreamadapter.h",
]
}
if (is_android) {
@ -491,6 +498,9 @@ static_library("rtc_base") {
}
if (is_ios || is_mac) {
if (is_ios) {
all_dependent_configs = [ ":ios_config" ]
}
sources += [
"maccocoathreadhelper.h",
"maccocoathreadhelper.mm",
@ -603,8 +613,6 @@ static_library("rtc_base") {
}
if (is_ios) {
all_dependent_configs = [ ":ios_config" ]
source_set("rtc_base_objc") {
deps = [
":rtc_base",