Revert of Removing #defines previously used for building without BoringSSL/OpenSSL. (patchset #2 id:20001 of https://codereview.webrtc.org/2640513002/ )
Reason for revert:
Broke chromium build, due to a config being removed. Will add it back and remove the dependency in a chromium CL.
Original issue's description:
> Removing #defines previously used for building without BoringSSL/OpenSSL.
>
> These defines don't work any more, so they only cause confusion:
>
> FEATURE_ENABLE_SSL
> HAVE_OPENSSL_SSL_H
> SSL_USE_OPENSSL
>
> BUG=webrtc:7025
>
> Review-Url: https://codereview.webrtc.org/2640513002
> Cr-Commit-Position: refs/heads/master@{#16196}
> Committed: https://chromium.googlesource.com/external/webrtc/+/eaa826c2ee0668cfb4a0dfb66f8d388b65da20f5
TBR=kjellander@webrtc.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=webrtc:7025
Review-Url: https://codereview.webrtc.org/2648003003
Cr-Commit-Position: refs/heads/master@{#16197}
diff --git a/webrtc/base/BUILD.gn b/webrtc/base/BUILD.gn
index 1a68b3a..51882da 100644
--- a/webrtc/base/BUILD.gn
+++ b/webrtc/base/BUILD.gn
@@ -35,10 +35,21 @@
}
}
+config("rtc_base_config") {
+ defines = [ "FEATURE_ENABLE_SSL" ]
+}
+
config("rtc_base_chromium_config") {
defines = [ "NO_MAIN_THREAD_WRAPPING" ]
}
+config("openssl_config") {
+ defines = [
+ "SSL_USE_OPENSSL",
+ "HAVE_OPENSSL_SSL_H",
+ ]
+}
+
config("rtc_base_all_dependent_config") {
if (is_ios) {
libs = [
@@ -360,6 +371,16 @@
":rtc_base_approved",
]
+ configs += [
+ ":openssl_config",
+ ":rtc_base_config",
+ ]
+
+ public_configs = [
+ ":openssl_config",
+ ":rtc_base_config",
+ ]
+
all_dependent_configs = [ ":rtc_base_all_dependent_config" ]
sources = [
@@ -516,6 +537,7 @@
"proxyserver.h",
"rollingaccumulator.h",
"scopedptrcollection.h",
+ "sslconfig.h",
"sslroots.h",
"testbase64.h",
"testclient.cc",