diff options
| author | Geoff Lang <geofflang@chromium.org> | 2024-05-10 16:06:19 -0400 |
|---|---|---|
| committer | Angle LUCI CQ <angle-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2024-05-11 14:08:00 +0000 |
| commit | c96435eda841bfcf34657919f39b97ed9ad7e670 (patch) | |
| tree | c183af9dcb91f78d75d737d7a7bddb7762668f8d | |
| parent | d1bb6ed8399dd12e79484f30f9e9ded95c25625a (diff) | |
| download | angle-upstream-main.tar.gz | |
Use Chromium's abseil build files with Dawn.upstream-main
Roll Dawn and set build_with_angle so that it uses chromium's abseil
buildfiles when building in an ANGLE checkout.
Bug: angleproject:8555
Change-Id: I8fc40fdefad734ef62bce374aa948367a42c03c6
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/5531113
Auto-Submit: Geoff Lang <geofflang@chromium.org>
Reviewed-by: Yuly Novikov <ynovikov@chromium.org>
Commit-Queue: Yuly Novikov <ynovikov@chromium.org>
| -rw-r--r-- | BUILD.gn | 10 | ||||
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | build_overrides/dawn.gni | 1 | ||||
| m--------- | third_party/dawn | 0 |
4 files changed, 4 insertions, 9 deletions
@@ -1245,15 +1245,9 @@ group("angle_abseil") { if (angle_enable_abseil) { # When build_with_chromium=true we need to include "//third_party/abseil-cpp:absl" while # we can be more specific when building standalone ANGLE. - if (build_with_chromium) { + # Also build the combined target when building Dawn to avoid multiply defined globals. + if (build_with_chromium || angle_enable_wgpu) { public_deps = [ "$angle_abseil_cpp_dir:absl" ] - } else if (angle_enable_wgpu) { - # Use Dawn's abseil build files when Dawn will also be built. Multiple build targets - # with the same files causes link issues in component builds. - public_deps = [ - "$angle_dawn_dir/third_party/gn/abseil-cpp:flat_hash_map", - "$angle_dawn_dir/third_party/gn/abseil-cpp:flat_hash_set", - ] } else { public_deps = [ "$angle_abseil_cpp_dir/absl/container:flat_hash_map", @@ -141,7 +141,7 @@ vars = { # Make Dawn skip its standalone dependencies 'dawn_standalone': False, - 'dawn_revision': '5406e9dfbe0ba766e5a7571e1ad7c2dc48ad57e7', + 'dawn_revision': 'd32858a3045a89e8c5ff919107ee76c8b103afdf', # All of the restricted traces (large). 'checkout_angle_restricted_traces': 'checkout_angle_internal', diff --git a/build_overrides/dawn.gni b/build_overrides/dawn.gni index c1b38f7be7..87769af630 100644 --- a/build_overrides/dawn.gni +++ b/build_overrides/dawn.gni @@ -1,4 +1,5 @@ build_with_chromium = false +build_with_angle = true dawn_build_dxc = false dawn_angle_dir = "//" diff --git a/third_party/dawn b/third_party/dawn -Subproject 5406e9dfbe0ba766e5a7571e1ad7c2dc48ad57e +Subproject d32858a3045a89e8c5ff919107ee76c8b103afd |