Revert "Roll Skia from 616258561f6d to 037b245586cf (8 revisions)"
This reverts commit 2126d32c917b07f303075250b7c9c02abdc68178.
Change-Id: I2a0b85f36c00283f3f831b5c3175c54887b43beb
diff --git a/DEPS b/DEPS
index 8e68dac..1f925be 100644
--- a/DEPS
+++ b/DEPS
@@ -9,7 +9,7 @@
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling different
# dependencies without interference from each other.
- 'infra_revision': '2fdfa81e82dcb1b1e9aa6b7aae2b1ee761e2c5c4',
+ 'infra_revision': '25c0effab2145c7eb1190db4b7ffeb794c025505',
# ninja CIPD package version.
# https://chrome-infra-packages.appspot.com/p/infra/3pp/tools/ninja
@@ -36,7 +36,7 @@
"third_party/externals/d3d12allocator" : "https://skia.googlesource.com/external/github.com/GPUOpen-LibrariesAndSDKs/D3D12MemoryAllocator.git@169895d529dfce00390a20e69c2f516066fe7a3b",
# Dawn requires jinja2 and markupsafe for the code generator, tint for SPIRV compilation, and abseil for string formatting.
# When the Dawn revision is updated these should be updated from the Dawn DEPS as well.
- "third_party/externals/dawn" : "https://dawn.googlesource.com/dawn.git@b6b32cb6d1a14c9b1cd442ae13d9183b27399019",
+ "third_party/externals/dawn" : "https://dawn.googlesource.com/dawn.git@6ac8346974d5c1301da8fe5856e2e9557abb9626",
"third_party/externals/jinja2" : "https://chromium.googlesource.com/chromium/src/third_party/jinja2@e2d024354e11cc6b041b0cff032d73f0c7e43a07",
"third_party/externals/markupsafe" : "https://chromium.googlesource.com/chromium/src/third_party/markupsafe@0bad08bb207bbfc1d6f3bbc82b9242b0c50e5794",
"third_party/externals/abseil-cpp" : "https://chromium.googlesource.com/chromium/src/third_party/abseil-cpp@cae4b6a3990e1431caa09c7b2ed1c76d0dfeab17",
@@ -64,7 +64,7 @@
"third_party/externals/partition_alloc" : "https://chromium.googlesource.com/chromium/src/base/allocator/partition_allocator.git@ce13777cb731e0a60c606d1741091fd11a0574d7",
"third_party/externals/perfetto" : "https://android.googlesource.com/platform/external/perfetto@93885509be1c9240bc55fa515ceb34811e54a394",
"third_party/externals/piex" : "https://android.googlesource.com/platform/external/piex.git@bb217acdca1cc0c16b704669dd6f91a1b509c406",
- "third_party/externals/swiftshader" : "https://swiftshader.googlesource.com/SwiftShader@a84d1801cf7b144da1cd3cca423ef36907c01771",
+ "third_party/externals/swiftshader" : "https://swiftshader.googlesource.com/SwiftShader@b347398f5e864dc2853c15da12efcd33c5412e1b",
"third_party/externals/vulkanmemoryallocator" : "https://chromium.googlesource.com/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator@a6bfc237255a6bac1513f7c1ebde6d8aed6b5191",
# vulkan-deps is a meta-repo containing several interdependent Khronos Vulkan repositories.
# When the vulkan-deps revision is updated, those repos (spirv-*, vulkan-*) should be updated as well.
diff --git a/METADATA b/METADATA
index 3e3923b..8de03f7 100644
--- a/METADATA
+++ b/METADATA
@@ -9,7 +9,7 @@
type: GIT
value: "https://skia.googlesource.com/skia"
}
- version: "037b245586cfbb572ffacdda4c3920421de3bcbe"
+ version: "e18960564cf87219fba6a076a7e194258d606a3d"
license_type: RECIPROCAL
last_upgrade_date {
year: 2025
diff --git a/bazel/deps.json b/bazel/deps.json
index db5d6f1..910739e 100644
--- a/bazel/deps.json
+++ b/bazel/deps.json
@@ -3,7 +3,7 @@
"direct": [
{
"build_file": "//bazel/external/dawn:BUILD.bazel",
- "commit": "b6b32cb6d1a14c9b1cd442ae13d9183b27399019",
+ "commit": "6ac8346974d5c1301da8fe5856e2e9557abb9626",
"name": "dawn",
"remote": "https://dawn.googlesource.com/dawn.git"
},
diff --git a/go.mod b/go.mod
index 5289e14..8a281cf 100644
--- a/go.mod
+++ b/go.mod
@@ -13,7 +13,7 @@
github.com/trietmn/go-wiki v1.0.1
github.com/vektra/mockery/v2 v2.52.2
go.chromium.org/luci v0.0.0-20240206071351-fb32c458db6e
- go.skia.org/infra v0.0.0-20250724002202-2fdfa81e82dc
+ go.skia.org/infra v0.0.0-20250723012913-25c0effab214
golang.org/x/exp v0.0.0-20250210185358-939b2ce775ac
google.golang.org/api v0.215.0
google.golang.org/protobuf v1.36.6
diff --git a/go.sum b/go.sum
index f95ec9f..33013df 100644
--- a/go.sum
+++ b/go.sum
@@ -405,8 +405,8 @@
go.opentelemetry.io/otel/sdk/metric v1.34.0/go.mod h1:jQ/r8Ze28zRKoNRdkjCZxfs6YvBTG1+YIqyFVFYec5w=
go.opentelemetry.io/otel/trace v1.34.0 h1:+ouXS2V8Rd4hp4580a8q23bg0azF2nI8cqLYnC8mh/k=
go.opentelemetry.io/otel/trace v1.34.0/go.mod h1:Svm7lSjQD7kG7KJ/MUHPVXSDGz2OX4h0M2jHBhmSfRE=
-go.skia.org/infra v0.0.0-20250724002202-2fdfa81e82dc h1:IjnV8+7nISZGWG6gAlFv6M5JRQrNOZzIP/SeLawxe6A=
-go.skia.org/infra v0.0.0-20250724002202-2fdfa81e82dc/go.mod h1:NkXvLX9PgKSwVZiJ3nCMle7xtGkcORHhJuJCwzWW0c8=
+go.skia.org/infra v0.0.0-20250723012913-25c0effab214 h1:pz6a9VHAA2PKX2dWJknWweT2fVYXg7uvvluk83zPXk4=
+go.skia.org/infra v0.0.0-20250723012913-25c0effab214/go.mod h1:NkXvLX9PgKSwVZiJ3nCMle7xtGkcORHhJuJCwzWW0c8=
go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
diff --git a/infra/bots/deps/deps_gen.go b/infra/bots/deps/deps_gen.go
index 873cd60..f8a0ab1 100644
--- a/infra/bots/deps/deps_gen.go
+++ b/infra/bots/deps/deps_gen.go
@@ -154,7 +154,7 @@
},
"dawn.googlesource.com/dawn": {
Id: "dawn.googlesource.com/dawn",
- Version: "b6b32cb6d1a14c9b1cd442ae13d9183b27399019",
+ Version: "6ac8346974d5c1301da8fe5856e2e9557abb9626",
Path: "third_party/externals/dawn",
},
"infra/3pp/tools/ninja": {
@@ -164,7 +164,7 @@
},
"skia.googlesource.com/buildbot": {
Id: "skia.googlesource.com/buildbot",
- Version: "2fdfa81e82dcb1b1e9aa6b7aae2b1ee761e2c5c4",
+ Version: "25c0effab2145c7eb1190db4b7ffeb794c025505",
Path: "infra/skia-infra",
},
"skia.googlesource.com/external/github.com/AOMediaCodec/libavif": {
@@ -244,12 +244,12 @@
},
"skia/tools/sk": {
Id: "skia/tools/sk",
- Version: "git_revision:2fdfa81e82dcb1b1e9aa6b7aae2b1ee761e2c5c4",
+ Version: "git_revision:25c0effab2145c7eb1190db4b7ffeb794c025505",
Path: "bin",
},
"swiftshader.googlesource.com/SwiftShader": {
Id: "swiftshader.googlesource.com/SwiftShader",
- Version: "a84d1801cf7b144da1cd3cca423ef36907c01771",
+ Version: "b347398f5e864dc2853c15da12efcd33c5412e1b",
Path: "third_party/externals/swiftshader",
},
}
