From 0db3db94e5ddde90f37120c8b67866b5c7d5a5f0 Mon Sep 17 00:00:00 2001 From: sdefresne Date: Mon, 21 Mar 2016 11:20:28 -0700 Subject: [PATCH] Put config in sync between gyp and gn. webrtc/base/base.gyp unconditionally set SSL_USE_OPENSSL and HAVE_OPENSSL_SSL_H, fix webrtc/base/BUILD.gn to do the same. Better implementation than https://codereview.webrtc.org/1441323002 to fix the same underlying issue (i.e. compilation on iOS). BUG=459705 Review URL: https://codereview.webrtc.org/1812213002 Cr-Commit-Position: refs/heads/master@{#12078} --- webrtc/base/BUILD.gn | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/webrtc/base/BUILD.gn b/webrtc/base/BUILD.gn index c93f9fbb82..5cb428727e 100644 --- a/webrtc/base/BUILD.gn +++ b/webrtc/base/BUILD.gn @@ -190,11 +190,13 @@ static_library("rtc_base") { configs += [ "..:common_config", + ":openssl_config", ":rtc_base_config", ] public_configs = [ "..:common_inherited_config", + ":openssl_config", ":rtc_base_config", ] @@ -485,7 +487,6 @@ static_library("rtc_base") { } if (use_openssl) { - public_configs += [ ":openssl_config" ] if (rtc_build_ssl) { deps += [ "//third_party/boringssl" ] } else {