From 86a632879e9f2739516dbfd00799ded98e56c6de Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Thu, 26 Jan 2017 14:03:37 +0100 Subject: Make WebRTC support configurable MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit WebRTC is a big feature that Chromium has left configurable for a long time, we can forward that configurability to our users to allow them control it directly instead of just enabling it on desktop and disabling it on embedded. Change-Id: I4445e2189112205ddf1368bd5e197bab2df92092 Reviewed-by: Michael Brüning --- src/core/config/common.pri | 9 +++++++++ src/core/config/embedded_linux.pri | 1 - 2 files changed, 9 insertions(+), 1 deletion(-) (limited to 'src/core') diff --git a/src/core/config/common.pri b/src/core/config/common.pri index 7cdf34623..7307c4a46 100644 --- a/src/core/config/common.pri +++ b/src/core/config/common.pri @@ -35,6 +35,12 @@ use?(gn) { gn_args += enable_spellcheck=false } + use?(webrtc) { + gn_args += enable_webrtc=true + } else { + gn_args += enable_webrtc=false + } + } else { # Trigger Qt-specific build conditions. GYP_CONFIG += use_qt=1 @@ -68,3 +74,6 @@ use?(gn) { GYP_CONFIG += enable_plugins=0 enable_widevine=0 } } + +use?(webrtc): GYP_CONFIG += enable_webrtc=1 +else: GYP_CONFIG += enable_webrtc=0 diff --git a/src/core/config/embedded_linux.pri b/src/core/config/embedded_linux.pri index 08c8c1661..c9de47562 100644 --- a/src/core/config/embedded_linux.pri +++ b/src/core/config/embedded_linux.pri @@ -18,7 +18,6 @@ GYP_CONFIG += \ enable_session_service=0 \ enable_task_manager=0 \ enable_themes=0 \ - enable_webrtc=0 \ gtest_target_type=none \ host_clang=0 \ notifications=0 \ -- cgit v1.2.3