Skip to content

Commit 6220fed

Browse files
lokokungDawn LUCI CQ
lokokung
authored and
Dawn LUCI CQ
committed
Roll DEPS for a bunch of dependencies in order to roll build/.
 - Roll gn version 487f8353f1..5d0a4153b0 (45 commits) https://gn.googlesource.com/gn/+log/487f8353f1..5d0a4153b0 - Roll build/ 5b9c84abf..0c8d2cd8f (194 commits) https://chromium.googlesource.com/chromium/src/build/+log/5b9c84abf978..0c8d2cd8fbe6 - Roll buildtools/ bb0dbc354..958004daa (77 commits) https://chromium.googlesource.com/chromium/src/buildtools/+log/bb0dbc354cf9..958004daacdd - Roll tools/clang/ 2ca74111d..8e6c4696e (32 commits) https://chromium.googlesource.com/chromium/src/tools/clang/+log/2ca74111d25f..8e6c4696e2ae - Roll testing/ ae9705179..2b3969474 (2500 commits) https://chromium.googlesource.com/chromium/src/testing/+log/ae9705179f82..2b39694741d6 - Roll third_party/libc++/src/ 621455c85..d957c6fda (171 commits) https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git/+log/621455c85cae..d957c6fda58b - Roll third_party/libc++abi/src/ b6f2833c9..f7f5a32b3 (3 commits) https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git/+log/b6f2833c9954..f7f5a32b3e95 - Roll third_party/llvm-libc/src/ 630ea5577..c909c9e43 (256 commits) https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libc.git/+log/630ea5577da4..c909c9e439a6 - Roll third_party/abseil-cpp/ cae4b6a39..9d692d669 (27 commits) https://chromium.googlesource.com/chromium/src/third_party/abseil-cpp/+log/cae4b6a3990e..9d692d669253 - Roll third_party/libFuzzer/src/ e31b99917..bea408a6e (5 commits) https://chromium.googlesource.com/external/github.com/llvm/llvm-project/compiler-rt/lib/fuzzer.git/+log/e31b99917861..bea408a6e01f - Roll third_party/partition_alloc/ 2041003ba..fae4df38c (122 commits) https://chromium.googlesource.com/chromium/src/base/allocator/partition_allocator.git/+log/2041003ba674..fae4df38cef9 - Roll third_party/protobuf/ 1a4051088..fef7a765b (41 commits) https://chromium.googlesource.com/chromium/src/third_party/protobuf/+log/1a4051088b71..fef7a765bb0d - Roll third_party/emsdk/ 419021fa0..eff90ca04 (19 commits) 
https://chromium.googlesource.com/external/github.com/emscripten-core/emsdk.git/+log/419021fa0404..eff90ca04a37 - Roll third_party/zlib/ 209717dd6..caf4afa1a (43 commits) https://chromium.googlesource.com/chromium/src/third_party/zlib/+log/209717dd69cd..caf4afa1afc9 Created with: roll-dep build roll-dep buildtools roll-dep tools/clang roll-dep testing roll-dep third_party/libc++/src roll-dep third_party/libc++abi/src roll-dep third_party/llvm-libc/src roll-dep third_party/abseil-cpp roll-dep third_party/libFuzzer/src roll-dep third_party/partition_alloc roll-dep third_party/protobuf roll-dep third_party/emsdk roll-dep third_party/zlib Change-Id: Icd43140bc987ddf221d4896b16adc63ff71a04d9 Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/261694 Reviewed-by: Kai Ninomiya <[email protected]> Commit-Queue: dan sinclair <[email protected]> Reviewed-by: dan sinclair <[email protected]>
1 parent 054877e commit 6220fed

File tree

121 files changed

+221
-217
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

121 files changed

+221
-217
lines changed

‎DEPS‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ vars = {
2121
'dawn_tintd': False, # Also fetches dependencies required for building tintd.
2222
'dawn_cmake_version': 'version:[email protected]',
2323
'dawn_cmake_win32_sha1': 'b106d66bcdc8a71ea2cdf5446091327bfdb1bcd7',
24-
'dawn_gn_version': 'git_revision:487f8353f15456474437df32bb186187b0940b45',
24+
'dawn_gn_version': 'git_revision:5d0a4153b0bcc86c5a23310d5b648a587be3c56d',
2525
# ninja CIPD package version.
2626
# https://chrome-infra-packages.appspot.com/p/infra/3pp/tools/ninja
2727
'dawn_ninja_version': 'version:[email protected]',
@@ -63,7 +63,7 @@ vars = {
6363

6464
deps = {
6565
'buildtools': {
66-
'url': '{chromium_git}/chromium/src/buildtools@bb0dbc354cf9dd386f59a4db38564a21be756cd9',
66+
'url': '{chromium_git}/chromium/src/buildtools@958004daacdd90070d44b236a1581c81d71740ca',
6767
'condition': 'dawn_standalone',
6868
},
6969
'third_party/clang-format/script': {
@@ -101,18 +101,18 @@ deps = {
101101
},
102102

103103
'third_party/libc++/src': {
104-
'url': '{chromium_git}/external/github.com/llvm/llvm-project/libcxx.git@621455c85cae8e246fc9380159a68f775ffe385b',
104+
'url': '{chromium_git}/external/github.com/llvm/llvm-project/libcxx.git@d957c6fda58b826b7982d90be9f94d261fe0e22c',
105105
'condition': 'dawn_standalone',
106106
},
107107

108108
'third_party/libc++abi/src': {
109-
'url': '{chromium_git}/external/github.com/llvm/llvm-project/libcxxabi.git@b6f2833c99549e5725055f6e9c795ca6e226afc0',
109+
'url': '{chromium_git}/external/github.com/llvm/llvm-project/libcxxabi.git@f7f5a32b3e9582092d8a4511acec036a09ae8524',
110110
'condition': 'dawn_standalone',
111111
},
112112

113113
# Required by libc++
114114
'third_party/llvm-libc/src': {
115-
'url': '{chromium_git}/external/github.com/llvm/llvm-project/libc.git@630ea5577da4c334db1df16ff9472843f4a8aad2',
115+
'url': '{chromium_git}/external/github.com/llvm/llvm-project/libc.git@c909c9e439a6ac2c15eae2cc43c5b4c9f6ee0f3a',
116116
'condition': 'dawn_standalone',
117117
},
118118

@@ -127,11 +127,11 @@ deps = {
127127
# The //build, //tools/clang, //tools/memory, and '//tools/valgrind' deps
128128
# should all be updated in unison, as there are dependencies between them.
129129
'build': {
130-
'url': '{chromium_git}/chromium/src/build@5b9c84abf9780026fc4ede5c09a6f0d2652f8f83',
130+
'url': '{chromium_git}/chromium/src/build@0c8d2cd8fbe6a0755441ba3f6402bb241a3f6f1e',
131131
'condition': 'dawn_standalone',
132132
},
133133
'tools/clang': {
134-
'url': '{chromium_git}/chromium/src/tools/clang@2ca74111d25f5c3bc96d3bb18aa54fa445b961eb',
134+
'url': '{chromium_git}/chromium/src/tools/clang@8e6c4696e2aee88cf2c60c1e6a527069fb735c14',
135135
'condition': 'dawn_standalone',
136136
},
137137
'tools/memory': {
@@ -233,11 +233,11 @@ deps = {
233233

234234
# Testing, GTest and GMock
235235
'testing': {
236-
'url': '{chromium_git}/chromium/src/testing@ae9705179f821d1dbd2b0a2ba7a6582faac7f86b',
236+
'url': '{chromium_git}/chromium/src/testing@2b39694741d609b78948e2330a47d684e723f229',
237237
'condition': 'dawn_standalone',
238238
},
239239
'third_party/libFuzzer/src': {
240-
'url': '{chromium_git}/external/github.com/llvm/llvm-project/compiler-rt/lib/fuzzer.git' + '@' + 'e31b99917861f891308269c36a32363b120126bb',
240+
'url': '{chromium_git}/external/github.com/llvm/llvm-project/compiler-rt/lib/fuzzer.git' + '@' + 'bea408a6e01f0f7e6c82a43121fe3af4506c932e',
241241
'condition': 'dawn_standalone',
242242
},
243243
'third_party/googletest': {
@@ -335,12 +335,12 @@ deps = {
335335
},
336336

337337
'third_party/zlib': {
338-
'url': '{chromium_git}/chromium/src/third_party/zlib@209717dd69cd62f24cbacc4758261ae2dd78cfac',
338+
'url': '{chromium_git}/chromium/src/third_party/zlib@caf4afa1afc92e16fef429f182444bed98a46a6c',
339339
'condition': 'dawn_standalone',
340340
},
341341

342342
'third_party/abseil-cpp': {
343-
'url': '{chromium_git}/chromium/src/third_party/abseil-cpp@cae4b6a3990e1431caa09c7b2ed1c76d0dfeab17',
343+
'url': '{chromium_git}/chromium/src/third_party/abseil-cpp@9d692d669253232c024b20ae19d2ff0b581ee1cd',
344344
'condition': 'dawn_standalone',
345345
},
346346

@@ -372,7 +372,7 @@ deps = {
372372
'third_party/emsdk': {
373373
# Note: Always use an emsdk hash referring to a tagged release, just so
374374
# emsdk and emscripten are always in sync with an exact release.
375-
'url': '{chromium_git}/external/github.com/emscripten-core/emsdk.git@419021fa040428bc69ef1559b325addb8e10211f',
375+
'url': '{chromium_git}/external/github.com/emscripten-core/emsdk.git@eff90ca04a3785f571a8095b3a42b63799cf384a',
376376
'condition': 'dawn_wasm',
377377
},
378378

@@ -459,7 +459,7 @@ deps = {
459459

460460
# Misc dependencies inherited from Tint
461461
'third_party/protobuf': {
462-
'url': '{chromium_git}/chromium/src/third_party/protobuf@1a4051088b71355d44591172c474304331aaddad',
462+
'url': '{chromium_git}/chromium/src/third_party/protobuf@fef7a765bb0d1122d32b99f588537b83e2dffe7b',
463463
'condition': 'dawn_standalone',
464464
},
465465

@@ -487,7 +487,7 @@ deps = {
487487
# Dependencies for PartitionAlloc.
488488
# Doc: https://docs.google.com/document/d/1wz45t0alQthsIU9P7_rQcfQyqnrBMXzrOjSzdQo-V-A
489489
'third_party/partition_alloc': {
490-
'url': '{chromium_git}/chromium/src/base/allocator/partition_allocator.git@2041003ba674f918c33b1afaaad74e652f34bcea',
490+
'url': '{chromium_git}/chromium/src/base/allocator/partition_allocator.git@fae4df38cef9720a13dd55a6b1d20600919e671b',
491491
'condition': 'dawn_standalone',
492492
},
493493
}

‎build‎

Submodule build updated from 5b9c84a to 0c8d2cd

‎build_overrides/partition_alloc.gni‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ _supported = _compiler_supported && _build_type_supported &&
5454

5555
use_partition_alloc_as_malloc_default = _supported
5656
use_allocator_shim_default = _supported
57+
shim_supports_sized_dealloc_default = false
5758
enable_backup_ref_ptr_support_default = _supported
5859
put_ref_count_in_previous_slot_default = true
5960
enable_backup_ref_ptr_slow_checks_default = false

‎buildtools‎

Submodule buildtools updated from bb0dbc3 to 958004d

‎src/tint/CMakeLists.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@ function(tint_default_compile_options TARGET)
103103
set(COMMON_CLANG_OPTIONS
104104
-Wno-c++98-compat
105105
-Wno-c++98-compat-pedantic
106+
-Wno-deprecated-copy-with-dtor
106107
-Wno-format-pedantic
107108
-Wno-poison-system-directories
108109
-Wno-return-std-move-in-c++11
@@ -141,6 +142,7 @@ function(tint_default_compile_options TARGET)
141142
/bigobj
142143
/EHsc
143144
/W4
145+
/wd4018 # '>=': signed/unsigned mismatch (Comes from protobuf library)
144146
/wd4068 # unknown pragma
145147
/wd4127 # conditional expression is constant
146148
/wd4244 # 'conversion' conversion from 'type1' to 'type2', possible loss of data

‎src/tint/api/BUILD.gn‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ libtint_source_set("api") {
4949
"tint.h",
5050
]
5151
deps = [
52-
"${dawn_root}/src/utils:utils",
52+
"${dawn_root}/src/utils",
5353
"${tint_src_dir}/api/common",
5454
"${tint_src_dir}/lang/core",
5555
"${tint_src_dir}/lang/core/constant",
@@ -118,7 +118,7 @@ if (tint_build_unittests) {
118118
tint_unittests_source_set("unittests") {
119119
sources = [ "tint_api_test.cc" ]
120120
deps = [
121-
"${dawn_root}/src/utils:utils",
121+
"${dawn_root}/src/utils",
122122
"${tint_src_dir}:gmock_and_gtest",
123123
"${tint_src_dir}/api",
124124
"${tint_src_dir}/lang/wgsl",

‎src/tint/api/common/BUILD.gn‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ libtint_source_set("common") {
5353
"vertex_pulling_config.h",
5454
]
5555
deps = [
56-
"${dawn_root}/src/utils:utils",
56+
"${dawn_root}/src/utils",
5757
"${tint_src_dir}/utils",
5858
"${tint_src_dir}/utils/containers",
5959
"${tint_src_dir}/utils/ice",
@@ -71,7 +71,7 @@ if (tint_build_unittests) {
7171
"vertex_pulling_config_test.cc",
7272
]
7373
deps = [
74-
"${dawn_root}/src/utils:utils",
74+
"${dawn_root}/src/utils",
7575
"${tint_src_dir}:gmock_and_gtest",
7676
"${tint_src_dir}/api/common",
7777
"${tint_src_dir}/utils",

‎src/tint/cmd/bench/BUILD.gn‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ if (tint_build_benchmarks) {
5353
"validator_bench.cc",
5454
]
5555
deps = [
56-
"${dawn_root}/src/utils:utils",
56+
"${dawn_root}/src/utils",
5757
"${tint_src_dir}:google_benchmark",
5858
"${tint_src_dir}/api/common",
5959
"${tint_src_dir}/lang/core",
@@ -89,7 +89,7 @@ if (tint_build_benchmarks) {
8989
output_name = "tint_benchmark"
9090
sources = [ "main_bench.cc" ]
9191
deps = [
92-
"${dawn_root}/src/utils:utils",
92+
"${dawn_root}/src/utils",
9393
"${tint_src_dir}:google_benchmark",
9494
"${tint_src_dir}/api/common",
9595
"${tint_src_dir}/lang/core",
@@ -129,7 +129,7 @@ if (tint_build_benchmarks) {
129129
}
130130

131131
if (tint_build_wgsl_reader) {
132-
deps += [ "${tint_src_dir}/cmd/bench:bench" ]
132+
deps += [ "${tint_src_dir}/cmd/bench" ]
133133
}
134134

135135
if (tint_build_wgsl_writer && tint_build_wgsl_reader) {

‎src/tint/cmd/bench/glsl/BUILD.gn‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ if (tint_build_benchmarks) {
4747
tint_benchmarks_source_set("bench") {
4848
sources = [ "writer_bench.cc" ]
4949
deps = [
50-
"${dawn_root}/src/utils:utils",
50+
"${dawn_root}/src/utils",
5151
"${tint_src_dir}:google_benchmark",
5252
"${tint_src_dir}/api/common",
5353
"${tint_src_dir}/lang/core",
@@ -82,7 +82,7 @@ if (tint_build_benchmarks) {
8282

8383
if (tint_build_wgsl_reader) {
8484
deps += [
85-
"${tint_src_dir}/cmd/bench:bench",
85+
"${tint_src_dir}/cmd/bench",
8686
"${tint_src_dir}/lang/wgsl/reader",
8787
]
8888
}

‎src/tint/cmd/bench/hlsl/BUILD.gn‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ if (tint_build_benchmarks) {
4747
tint_benchmarks_source_set("bench") {
4848
sources = [ "writer_bench.cc" ]
4949
deps = [
50-
"${dawn_root}/src/utils:utils",
50+
"${dawn_root}/src/utils",
5151
"${tint_src_dir}:google_benchmark",
5252
"${tint_src_dir}/api/common",
5353
"${tint_src_dir}/lang/core",
@@ -78,7 +78,7 @@ if (tint_build_benchmarks) {
7878

7979
if (tint_build_wgsl_reader) {
8080
deps += [
81-
"${tint_src_dir}/cmd/bench:bench",
81+
"${tint_src_dir}/cmd/bench",
8282
"${tint_src_dir}/lang/wgsl/reader",
8383
]
8484
}

0 commit comments

Comments
 (0)