summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Klocek <michal.klocek@qt.io>2022-01-25 12:05:43 +0100
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2022-11-09 11:47:47 +0100
commit89585d867b4b4a18204be6df40b5ed3bbdb977d0 (patch)
tree956b8d0f14b9646d84424610fc00ade208d1124d
parent65c2fd6bb44f875dba69fa968c2e13684c42ced6 (diff)
downloadqtwebengine-chromium-89585d867b4b4a18204be6df40b5ed3bbdb977d0.tar.gz
Add qtpdf ios gn adaptations
Task-number: QTBUG-88614 Change-Id: I1f97b642ea031ae27f6f369a5c33301d72093d8f Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
-rw-r--r--chromium/components/BUILD.gn2
-rw-r--r--chromium/gpu/BUILD.gn5
-rw-r--r--chromium/ios/web/BUILD.gn21
-rw-r--r--chromium/media/BUILD.gn2
-rw-r--r--chromium/media/mojo/services/BUILD.gn5
-rw-r--r--chromium/third_party/dawn/src/dawn/wire/BUILD.gn5
6 files changed, 27 insertions, 13 deletions
diff --git a/chromium/components/BUILD.gn b/chromium/components/BUILD.gn
index 9f1276c253e..96fe8273316 100644
--- a/chromium/components/BUILD.gn
+++ b/chromium/components/BUILD.gn
@@ -677,7 +677,7 @@ test("components_unittests") {
assert_no_deps += disallowed_extension_deps_
}
- if (is_ios) {
+ if (is_ios && !use_qt) {
assert_no_deps += ios_assert_no_deps
}
}
diff --git a/chromium/gpu/BUILD.gn b/chromium/gpu/BUILD.gn
index 24c66860f9e..3de56a2e606 100644
--- a/chromium/gpu/BUILD.gn
+++ b/chromium/gpu/BUILD.gn
@@ -251,8 +251,11 @@ if (!is_android && !is_fuchsia && !is_chromeos_ash) {
":gl_lpm_shader_to_string",
"//base/test:run_all_unittests",
"//testing/gtest",
- "//third_party/protobuf:protobuf_full",
]
+
+ if(!is_ios) {
+ deps += [ "//third_party/protobuf:protobuf_full" ]
+ }
}
fuzzer_test("gl_lpm_fuzzer") {
diff --git a/chromium/ios/web/BUILD.gn b/chromium/ios/web/BUILD.gn
index 9d8b7309f81..81e08770721 100644
--- a/chromium/ios/web/BUILD.gn
+++ b/chromium/ios/web/BUILD.gn
@@ -9,10 +9,13 @@ import("//tools/grit/grit_rule.gni")
group("all_tests") {
testonly = true
- deps = [
- ":ios_web_inttests",
- ":ios_web_unittests",
- ]
+ deps = []
+ if (!use_qt) {
+ deps += [
+ ":ios_web_inttests",
+ ":ios_web_unittests",
+ ]
+ }
}
source_set("web") {
@@ -183,8 +186,9 @@ test("ios_web_unittests") {
"//ios/web/test:packed_resources",
"//ios/web/web_view:unittests",
]
-
- assert_no_deps = ios_assert_no_deps
+ if (!use_qt) {
+ assert_no_deps = ios_assert_no_deps
+ }
configs += [ "//build/config/compiler:enable_arc" ]
}
@@ -635,8 +639,9 @@ test("ios_web_inttests") {
"webui/web_ui_inttest.mm",
"webui/web_ui_mojo_inttest.mm",
]
-
- assert_no_deps = ios_assert_no_deps
+ if (!use_qt) {
+ assert_no_deps = ios_assert_no_deps
+ }
}
optimize_js("plugin_placeholder_js") {
diff --git a/chromium/media/BUILD.gn b/chromium/media/BUILD.gn
index b796d4be77f..2ee207a9a2f 100644
--- a/chromium/media/BUILD.gn
+++ b/chromium/media/BUILD.gn
@@ -102,7 +102,7 @@ config("media_config") {
#
config("subcomponent_config") {
visibility = media_subcomponent_deps
- if (is_mac) {
+ if (is_mac || is_ios) {
visibility += [ "//media/base/mac" ]
}
defines = [ "IS_MEDIA_IMPL" ]
diff --git a/chromium/media/mojo/services/BUILD.gn b/chromium/media/mojo/services/BUILD.gn
index f0bb375a5c1..92e4a8ce12b 100644
--- a/chromium/media/mojo/services/BUILD.gn
+++ b/chromium/media/mojo/services/BUILD.gn
@@ -233,7 +233,6 @@ source_set("unit_tests") {
"//media/mojo/common",
"//media/mojo/mojom",
"//mojo/core/embedder",
- "//mojo/public/interfaces/bindings/tests:test_interfaces",
"//services/metrics/public/cpp:ukm_builders",
"//services/service_manager/public/cpp",
"//services/service_manager/public/cpp/test:test_support",
@@ -241,6 +240,10 @@ source_set("unit_tests") {
"//testing/gtest",
]
+ if (!is_ios) {
+ deps += ["//mojo/public/interfaces/bindings/tests:test_interfaces"]
+ }
+
if (enable_library_cdms) {
sources += [
"cdm_service_broker_unittest.cc",
diff --git a/chromium/third_party/dawn/src/dawn/wire/BUILD.gn b/chromium/third_party/dawn/src/dawn/wire/BUILD.gn
index 56aa0388790..9a349293be9 100644
--- a/chromium/third_party/dawn/src/dawn/wire/BUILD.gn
+++ b/chromium/third_party/dawn/src/dawn/wire/BUILD.gn
@@ -53,9 +53,12 @@ dawn_component("wire") {
deps = [
":gen",
- "${dawn_root}/src/dawn/common",
]
+ if (is_win || is_linux || is_chromeos || is_mac || is_fuchsia || is_android) {
+ deps += [ "${dawn_root}/src/dawn/common" ]
+ }
+
configs = [ "${dawn_root}/src/dawn/common:internal_config" ]
sources = get_target_outputs(":gen")
sources += [