diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-12-14 00:16:30 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-12-14 00:16:30 +0000 |
commit | 92332363fff6975f5757f0e81e7816f0dbc6796b (patch) | |
tree | 318cd362924872b826ffa703b3e0a6aabca7ac64 | |
parent | 878b7527e9295d453149989c273fc639fd2fa59d (diff) | |
parent | 8b5ef591c10e4cac1296adbbb347b8f47a3f7e2d (diff) | |
download | skia-android14-qpr2-s2-release.tar.gz |
Snap for 11216811 from 8b5ef591c10e4cac1296adbbb347b8f47a3f7e2d to 24Q1-releaseandroid-14.0.0_r37android-14.0.0_r36android-14.0.0_r35android-14.0.0_r34android-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r29android14-qpr2-s5-releaseandroid14-qpr2-s4-releaseandroid14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-release
Change-Id: I9b84683b585992f5467db2657222d17724a9fa9c
-rw-r--r-- | DEPS | 8 | ||||
-rw-r--r-- | METADATA | 4 | ||||
-rw-r--r-- | bazel/deps.bzl | 2 |
3 files changed, 7 insertions, 7 deletions
@@ -4,7 +4,7 @@ vars = { # Three lines of non-changing comments so that # the commit queue can handle CLs rolling different # dependencies without interference from each other. - 'sk_tool_revision': 'git_revision:f92827c3066c072b7cb10d2817f36706383d590f', + 'sk_tool_revision': 'git_revision:7b71af53266aa6b6f986438f5ed22fd80e661158', # ninja CIPD package version. # https://chrome-infra-packages.appspot.com/p/infra/3pp/tools/ninja @@ -23,12 +23,12 @@ vars = { # ./tools/git-sync-deps deps = { "buildtools" : "https://chromium.googlesource.com/chromium/src/buildtools.git@b138e6ce86ae843c42a1a08f37903207bebcca75", - "third_party/externals/angle2" : "https://chromium.googlesource.com/angle/angle.git@de591cff03161df5601291ac3deef54933d209a4", + "third_party/externals/angle2" : "https://chromium.googlesource.com/angle/angle.git@b25ffe5a9775cc912a304c8552dd9c097a93420a", "third_party/externals/brotli" : "https://skia.googlesource.com/external/github.com/google/brotli.git@6d03dfbedda1615c4cba1211f8d81735575209c8", "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@cebf22738909498596d4c7ede83d229addbd5e9e", + "third_party/externals/dawn" : "https://dawn.googlesource.com/dawn.git@033f24e72cc01610ae2a51aaacf124950b7032c2", "third_party/externals/jinja2" : "https://chromium.googlesource.com/chromium/src/third_party/jinja2@515dd10de9bf63040045902a4a310d2ba25213a0", "third_party/externals/markupsafe" : "https://chromium.googlesource.com/chromium/src/third_party/markupsafe@006709ba3ed87660a17bd4548c45663628f5ed85", "third_party/externals/abseil-cpp" : "https://skia.googlesource.com/external/github.com/abseil/abseil-cpp.git@cb436cf0142b4cbe47aae94223443df7f82e2920", @@ -60,7 +60,7 @@ deps = { "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. - "third_party/externals/vulkan-deps" : "https://chromium.googlesource.com/vulkan-deps@ebfd5875d4b769d547c26945915805bd72ba86f5", + "third_party/externals/vulkan-deps" : "https://chromium.googlesource.com/vulkan-deps@de368ee1bf180b4d7dfcc007ac649eca63735ba2", "third_party/externals/spirv-cross" : "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Cross@f349c91274b91c1a7c173f2df70ec53080076191", "third_party/externals/spirv-headers" : "https://skia.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers.git@1c6bb2743599e6eb6f37b2969acc0aef812e32e3", "third_party/externals/spirv-tools" : "https://skia.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools.git@e03c8f5c8ed77f0b1a2408d55bb8f00a7ee9793c", @@ -9,11 +9,11 @@ third_party { type: GIT value: "https://skia.googlesource.com/skia" } - version: "3a3475d12f220b795821eabae517ab7cb6f12c9f" + version: "f3401c6186c1371361f8c4042c9a927c1221c29a" license_type: RECIPROCAL last_upgrade_date { year: 2023 month: 12 - day: 12 + day: 13 } } diff --git a/bazel/deps.bzl b/bazel/deps.bzl index 8b17004250..4686f1df9c 100644 --- a/bazel/deps.bzl +++ b/bazel/deps.bzl @@ -30,7 +30,7 @@ def c_plus_plus_deps(ws = "@skia"): new_git_repository( name = "dawn", build_file = ws + "//bazel/external/dawn:BUILD.bazel", - commit = "cebf22738909498596d4c7ede83d229addbd5e9e", + commit = "033f24e72cc01610ae2a51aaacf124950b7032c2", remote = "https://dawn.googlesource.com/dawn.git", ) |