From 9cdd8765487865349ea983a70c6bd570b1d56846 Mon Sep 17 00:00:00 2001 From: Dan Minor Date: Tue, 16 Jan 2018 10:40:39 -0500 Subject: [PATCH] Remove improper build_with_mozilla clauses in rtc_base BUILD.gn MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit rtc_build_ssl is defined to be !build_with_mozilla, but we have tautological if conditions involving both. This removes the offending clauses for now. It makes more sense to address the problem during the next import of webrtc.org code into Firefox. Bug: webrtc:8670 Change-Id: I586deb7c33566efae6bb6380c9d4ae61a0fe1c37 Reviewed-on: https://webrtc-review.googlesource.com/39960 Reviewed-by: Mirko Bonadei Reviewed-by: Patrik Höglund Commit-Queue: Dan Minor Cr-Commit-Position: refs/heads/master@{#21662} --- rtc_base/BUILD.gn | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rtc_base/BUILD.gn b/rtc_base/BUILD.gn index 74bb964aca..0b8e9ae0e9 100644 --- a/rtc_base/BUILD.gn +++ b/rtc_base/BUILD.gn @@ -55,7 +55,7 @@ config("rtc_base_all_dependent_config") { } } -if (!rtc_build_ssl && !build_with_mozilla) { +if (!rtc_build_ssl) { config("external_ssl_library") { assert(rtc_ssl_root != "", "You must specify rtc_ssl_root when rtc_build_ssl==0.") @@ -703,7 +703,7 @@ rtc_static_library("rtc_base_generic") { if (rtc_build_ssl) { deps += [ "//third_party/boringssl" ] - } else if (!build_with_mozilla) { + } else { configs += [ ":external_ssl_library" ] }