summaryrefslogtreecommitdiffstats
path: root/src/core/configure
diff options
context:
space:
mode:
authorPeter Varga <pvarga@inf.u-szeged.hu>2021-05-26 21:57:33 +0200
committerPeter Varga <pvarga@inf.u-szeged.hu>2021-05-27 14:50:43 +0200
commit061c8adf127035dbfca39f2ce617e4e01afa8fed (patch)
tree0da70e92eed26ca6d1eceead0e097a519ceb1914 /src/core/configure
parentb239ad1ac5a9a8fc0404d330850849930c97aec6 (diff)
Fix generating webrtc logging resources with cmake
Also disable webrtc logging test if extensions are disabled. Change-Id: I49c8d4fb6049c9aed174f62f731b0f56dae490ba Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src/core/configure')
-rw-r--r--src/core/configure/BUILD.root.gn.in9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/core/configure/BUILD.root.gn.in b/src/core/configure/BUILD.root.gn.in
index 77d07f451..b341f067a 100644
--- a/src/core/configure/BUILD.root.gn.in
+++ b/src/core/configure/BUILD.root.gn.in
@@ -297,7 +297,6 @@ source_set("qtwebengine_sources") {
if (enable_webrtc && enable_extensions) {
deps += [
- "//chrome/browser/resources/media:webrtc_logs_resources",
"//components/upload_list",
"//components/webrtc_logging/browser",
"//components/webrtc_logging/common",
@@ -426,6 +425,14 @@ repack("qtwebengine_repack_resources") {
"//content/browser/webrtc/resources",
]
}
+ if (enable_webrtc && enable_extensions) {
+ sources += [
+ "$root_gen_dir/chrome/webrtc_logs_resources.pak",
+ ]
+ deps += [
+ "//chrome/browser/resources/media:webrtc_logs_resources",
+ ]
+ }
}
repack("qtwebengine_repack_resources_100") {