summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2020-08-03 14:04:56 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2021-10-04 10:19:41 +0200
commit58485c3305d6d3f96c8ee5e8869ac9887d7bc4d6 (patch)
tree83ef8deb13be96cb04751e4d6e6ed79f64046941
parent7fcadcd3aadd2b3119b8f5010602b47bc4d2d7a7 (diff)
downloadqtwebengine-chromium-58485c3305d6d3f96c8ee5e8869ac9887d7bc4d6.tar.gz
Do not depend on soda on Linux
Change-Id: I91c904709906d96a121abc77de4a293ada8b4042 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
-rw-r--r--chromium/content/utility/BUILD.gn4
-rw-r--r--chromium/content/utility/utility_main.cc2
2 files changed, 5 insertions, 1 deletions
diff --git a/chromium/content/utility/BUILD.gn b/chromium/content/utility/BUILD.gn
index 4b6a6cd4edb..d899cd26737 100644
--- a/chromium/content/utility/BUILD.gn
+++ b/chromium/content/utility/BUILD.gn
@@ -104,12 +104,14 @@ source_set("utility") {
if (is_linux || is_chromeos) {
deps += [
- "//content/utility/speech:speech_recognition_sandbox_hook",
"//services/network:network_sandbox_hook",
]
if (enable_basic_printing) {
deps += [ "//printing:printing_sandbox_hook" ]
}
+ if (!use_qt) {
+ deps += [ "//content/utility/speech:speech_recognition_sandbox_hook" ]
+ }
}
if (enable_vr && !is_android) {
diff --git a/chromium/content/utility/utility_main.cc b/chromium/content/utility/utility_main.cc
index 4b30d8f0ac7..69eb1cf9666 100644
--- a/chromium/content/utility/utility_main.cc
+++ b/chromium/content/utility/utility_main.cc
@@ -133,8 +133,10 @@ int UtilityMain(const MainFunctionParams& parameters) {
pre_sandbox_hook = base::BindOnce(&audio::AudioPreSandboxHook);
break;
case sandbox::policy::SandboxType::kSpeechRecognition:
+#if !defined(TOOLKIT_QT)
pre_sandbox_hook =
base::BindOnce(&speech::SpeechRecognitionPreSandboxHook);
+#endif
break;
#if BUILDFLAG(IS_CHROMEOS_ASH)
case sandbox::policy::SandboxType::kIme: