Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2447)

Unified Diff: webrtc/base/BUILD.gn

Issue 2648003003: Revert of Removing #defines previously used for building without BoringSSL/OpenSSL. (Closed)
Patch Set: Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/api/webrtcsession_unittest.cc ('k') | webrtc/base/helpers.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/base/BUILD.gn
diff --git a/webrtc/base/BUILD.gn b/webrtc/base/BUILD.gn
index 1a68b3abaccc151cd62758e80d920ca85093bb9f..51882da0f9b01facb2fd2ee0d7115bdf8d18bb09 100644
--- a/webrtc/base/BUILD.gn
+++ b/webrtc/base/BUILD.gn
@@ -35,8 +35,19 @@
}
}
+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") {
@@ -358,6 +369,16 @@
]
public_deps = [
":rtc_base_approved",
+ ]
+
+ configs += [
+ ":openssl_config",
+ ":rtc_base_config",
+ ]
+
+ public_configs = [
+ ":openssl_config",
+ ":rtc_base_config",
]
all_dependent_configs = [ ":rtc_base_all_dependent_config" ]
@@ -516,6 +537,7 @@
"proxyserver.h",
"rollingaccumulator.h",
"scopedptrcollection.h",
+ "sslconfig.h",
"sslroots.h",
"testbase64.h",
"testclient.cc",
« no previous file with comments | « webrtc/api/webrtcsession_unittest.cc ('k') | webrtc/base/helpers.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698