Commit b03817a2 authored by Elly Fong-Jones's avatar Elly Fong-Jones Committed by Commit Bot

cros: fix 'all' build meta-target

This meta-target had a couple of transitive dependencies on dawn,
despite dawn not being available on cros. This change makes those
dependencies conditional on `use_dawn`.

Bug: None
Change-Id: I630e8786ab21510a2caee54a85034591a215981a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1917380Reviewed-by: default avatarJohn Budorick <jbudorick@chromium.org>
Commit-Queue: Elly Fong-Jones <ellyjones@chromium.org>
Cr-Commit-Position: refs/heads/master@{#715328}
parent 5989e357
...@@ -23,6 +23,7 @@ import("//remoting/remoting_enable.gni") ...@@ -23,6 +23,7 @@ import("//remoting/remoting_enable.gni")
import("//third_party/openh264/openh264_args.gni") import("//third_party/openh264/openh264_args.gni")
import("//tools/ipc_fuzzer/ipc_fuzzer.gni") import("//tools/ipc_fuzzer/ipc_fuzzer.gni")
import("//ui/base/ui_features.gni") import("//ui/base/ui_features.gni")
import("//ui/gl/features.gni")
import("//ui/ozone/ozone.gni") import("//ui/ozone/ozone.gni")
import("//ui/webui/webui_features.gni") import("//ui/webui/webui_features.gni")
import("//v8/gni/snapshot_toolchain.gni") import("//v8/gni/snapshot_toolchain.gni")
...@@ -141,8 +142,6 @@ group("gn_all") { ...@@ -141,8 +142,6 @@ group("gn_all") {
"//third_party/SPIRV-Tools/src:SPIRV-Tools", "//third_party/SPIRV-Tools/src:SPIRV-Tools",
"//third_party/SPIRV-Tools/src/test/fuzzers", "//third_party/SPIRV-Tools/src/test/fuzzers",
"//third_party/cacheinvalidation:cacheinvalidation_unittests", "//third_party/cacheinvalidation:cacheinvalidation_unittests",
"//third_party/dawn:dawn_end2end_tests_temp_group",
"//third_party/dawn:dawn_unittests_temp_group",
"//third_party/pdfium/samples:pdfium_test", "//third_party/pdfium/samples:pdfium_test",
"//tools/perf/clear_system_cache", "//tools/perf/clear_system_cache",
"//tools/polymer:polymer_tools_python_unittests", "//tools/polymer:polymer_tools_python_unittests",
...@@ -802,6 +801,13 @@ group("gn_all") { ...@@ -802,6 +801,13 @@ group("gn_all") {
] ]
} }
if (use_dawn) {
deps += [
"//third_party/dawn:dawn_end2end_tests_temp_group",
"//third_party/dawn:dawn_unittests_temp_group",
]
}
# PFFFT. # PFFFT.
deps += [ deps += [
"//third_party/pffft:fuzzers", "//third_party/pffft:fuzzers",
......
...@@ -32,6 +32,7 @@ import("//testing/libfuzzer/fuzzer_test.gni") ...@@ -32,6 +32,7 @@ import("//testing/libfuzzer/fuzzer_test.gni")
import("//testing/test.gni") import("//testing/test.gni")
import("//third_party/widevine/cdm/widevine.gni") import("//third_party/widevine/cdm/widevine.gni")
import("//ui/base/ui_features.gni") import("//ui/base/ui_features.gni")
import("//ui/gl/features.gni")
import("//ui/views/features.gni") import("//ui/views/features.gni")
import("//v8/gni/v8.gni") import("//v8/gni/v8.gni")
...@@ -2830,7 +2831,7 @@ group("dawn_perf_tests") { ...@@ -2830,7 +2831,7 @@ group("dawn_perf_tests") {
data_deps = [ data_deps = [
"//testing:run_perf_test", "//testing:run_perf_test",
] ]
if (is_win || is_linux || is_mac) { if (use_dawn) {
data_deps += [ "//third_party/dawn:dawn_perf_tests_temp_group" ] data_deps += [ "//third_party/dawn:dawn_perf_tests_temp_group" ]
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment