From c70bd1837db3727ca4d1be68d220ea6185baf209 Mon Sep 17 00:00:00 2001 From: Taylor Brandstetter Date: Fri, 11 Dec 2020 11:30:43 -0800 Subject: [PATCH] Get rid of recently added rtc_openssl_is_boringssl build argument. It's unlikely to be used, so just rely on rtc_build_ssl instead. No-Try: True Bug: webrtc:11410 Change-Id: I74049bebfdde61b713eb187a48eabedf04da9369 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/197040 Commit-Queue: Mirko Bonadei Reviewed-by: Mirko Bonadei Cr-Commit-Position: refs/heads/master@{#32826} --- rtc_base/BUILD.gn | 3 ++- webrtc.gni | 4 ---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/rtc_base/BUILD.gn b/rtc_base/BUILD.gn index 8762bfbeb1..6f5331f700 100644 --- a/rtc_base/BUILD.gn +++ b/rtc_base/BUILD.gn @@ -960,7 +960,8 @@ rtc_library("rtc_base") { "unique_id_generator.h", ] - if (rtc_openssl_is_boringssl) { + # If we are building the SSL library ourselves, we know it's BoringSSL. + if (rtc_build_ssl) { sources += [ "boringssl_certificate.cc", "boringssl_certificate.h", diff --git a/webrtc.gni b/webrtc.gni index 2f6e77d1bf..05a230c4f1 100644 --- a/webrtc.gni +++ b/webrtc.gni @@ -227,10 +227,6 @@ declare_args() { rtc_libvpx_build_vp9 = !build_with_mozilla rtc_build_opus = !build_with_mozilla rtc_build_ssl = !build_with_mozilla - - # Can be set to true if rtc_build_ssl is false, but externally provided - # openssl library is boringssl, to enable the use of boringssl-specific code. - rtc_openssl_is_boringssl = !build_with_mozilla rtc_build_usrsctp = !build_with_mozilla # Enable libevent task queues on platforms that support it.