Skip to content

Commit

Permalink
cros: fix 'all' build meta-target
Browse files Browse the repository at this point in the history
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/+/1917380
Reviewed-by: John Budorick <jbudorick@chromium.org>
Commit-Queue: Elly Fong-Jones <ellyjones@chromium.org>
Cr-Commit-Position: refs/heads/master@{#715328}
  • Loading branch information
Elly Fong-Jones authored and Commit Bot committed Nov 14, 2019
1 parent 5989e35 commit b03817a
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 3 deletions.
10 changes: 8 additions & 2 deletions BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import("//remoting/remoting_enable.gni")
import("//third_party/openh264/openh264_args.gni")
import("//tools/ipc_fuzzer/ipc_fuzzer.gni")
import("//ui/base/ui_features.gni")
import("//ui/gl/features.gni")
import("//ui/ozone/ozone.gni")
import("//ui/webui/webui_features.gni")
import("//v8/gni/snapshot_toolchain.gni")
Expand Down Expand Up @@ -141,8 +142,6 @@ group("gn_all") {
"//third_party/SPIRV-Tools/src:SPIRV-Tools",
"//third_party/SPIRV-Tools/src/test/fuzzers",
"//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",
"//tools/perf/clear_system_cache",
"//tools/polymer:polymer_tools_python_unittests",
Expand Down Expand Up @@ -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.
deps += [
"//third_party/pffft:fuzzers",
Expand Down
3 changes: 2 additions & 1 deletion chrome/test/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ import("//testing/libfuzzer/fuzzer_test.gni")
import("//testing/test.gni")
import("//third_party/widevine/cdm/widevine.gni")
import("//ui/base/ui_features.gni")
import("//ui/gl/features.gni")
import("//ui/views/features.gni")
import("//v8/gni/v8.gni")

Expand Down Expand Up @@ -2830,7 +2831,7 @@ group("dawn_perf_tests") {
data_deps = [
"//testing:run_perf_test",
]
if (is_win || is_linux || is_mac) {
if (use_dawn) {
data_deps += [ "//third_party/dawn:dawn_perf_tests_temp_group" ]
}
}
Expand Down

0 comments on commit b03817a

Please sign in to comment.