From b4848e85b6fa9ba9a720012c1c8a87d93f9267c5 Mon Sep 17 00:00:00 2001 From: angle-autoroll Date: Wed, 13 Sep 2023 08:05:26 +0000 Subject: [PATCH] Roll Chromium from c661891ca003 to 459a6b238bc8 (608 revisions) https://chromium.googlesource.com/chromium/src.git/+log/c661891ca003..459a6b238bc8 If this roll has caused a breakage, revert this CL and stop the roller using the controls here: https://autoroll.skia.org/r/chromium-angle-autoroll Please CC angle-team@google.com,ianelliott@google.com on the revert to ensure that a human is aware of the problem. To file a bug in Chromium: https://bugs.chromium.org/p/chromium/issues/entry To file a bug in ANGLE: https://bugs.chromium.org/p/angleproject/issues/entry To report a problem with the AutoRoller itself, please file a bug: https://bugs.chromium.org/p/skia/issues/entry?template=Autoroller+Bug Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md Changed dependencies * build: https://chromium.googlesource.com/chromium/src/build.git/+log/1a25429fe3..4420c4de06 * buildtools/linux64: git_revision:cc56a0f98bb34accd5323316e0292575ff17a5d4..git_revision:991530ce394efb58fcd848195469022fa17ae126 * buildtools/mac: git_revision:cc56a0f98bb34accd5323316e0292575ff17a5d4..git_revision:991530ce394efb58fcd848195469022fa17ae126 * buildtools/win: git_revision:cc56a0f98bb34accd5323316e0292575ff17a5d4..git_revision:991530ce394efb58fcd848195469022fa17ae126 * testing: https://chromium.googlesource.com/chromium/src/testing/+log/ce02ccbb6e..f79e60f037 * third_party/android_sdk: https://chromium.googlesource.com/chromium/src/third_party/android_sdk/+log/ff414082cc..7ebbd1ea9b * third_party/catapult: https://chromium.googlesource.com/catapult.git/+log/4ca9d0910a..ddbdff3f20 * third_party/depot_tools: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+log/8babcb7e2e..bcba178212 * third_party/libc++abi/src: https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git/+log/d5209a75b3..d3ed8c086c * third_party/libunwind/src: https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git/+log/0568576055..d9b4abf6b6 * third_party/r8: fR4aBtFTaohfSjV_Y54-1MC5dV2cTK7iZrFUiGoVivgC..oP1tOCigL9cN6j-dfqmgRtMV5zOSZQ2IgaG11GSyNP0C * third_party/siso: git_revision:d967f854b8fcd36e484df1b6677fb003a8f48a8b..git_revision:412571deccd76eb54f681963ca14e13c3efc63e1 * tools/android: https://chromium.googlesource.com/chromium/src/tools/android/+log/438abc2caa..4bead2e08b * tools/mb: https://chromium.googlesource.com/chromium/src/tools/mb/+log/bea2565145..18e77c0dbd No update to Clang. Bug: angleproject:8315 Tbr: ianelliott@google.com Change-Id: Ica0a5bc156efd51b6b8ea07c28113944b15a40f3 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/4860376 Bot-Commit: angle-autoroll Commit-Queue: angle-autoroll --- DEPS | 30 +++++++++++++++--------------- build | 2 +- infra/specs/angle.json | 32 ++++++++++++++++---------------- infra/specs/mixins.pyl | 4 ++-- testing | 2 +- third_party/android_sdk | 2 +- third_party/catapult | 2 +- third_party/depot_tools | 2 +- third_party/libc++abi/src | 2 +- third_party/libunwind/src | 2 +- tools/android | 2 +- tools/mb | 2 +- 12 files changed, 42 insertions(+), 42 deletions(-) diff --git a/DEPS b/DEPS index e91fa456f..94eef0086 100644 --- a/DEPS +++ b/DEPS @@ -45,7 +45,7 @@ vars = { 'checkout_angle_mesa': False, # Version of Chromium our Chromium-based DEPS are mirrored from. - 'chromium_revision': 'c661891ca003400900e284f8eaca5828f2131464', + 'chromium_revision': '459a6b238bc88a52c73cf5f39546491edbab6534', # We never want to checkout chromium, # but need a dummy DEPS entry for the autoroller 'dummy_checkout_chromium': False, @@ -90,7 +90,7 @@ vars = { # Three lines of non-changing comments so that # the commit queue can handle CLs rolling catapult # and whatever else without interference from each other. - 'catapult_revision': '4ca9d0910a7d1fe1dbdf67c62c5753f36ba995cd', + 'catapult_revision': 'ddbdff3f2072e0fc960bc94d513759a8c45c2967', # the commit queue can handle CLs rolling Fuchsia sdk # and whatever else without interference from each other. @@ -151,7 +151,7 @@ vars = { 'reclient_version': 're_client_version:0.114.2.81e819b-gomaip', # siso CIPD package version. - 'siso_version': 'git_revision:d967f854b8fcd36e484df1b6677fb003a8f48a8b', + 'siso_version': 'git_revision:412571deccd76eb54f681963ca14e13c3efc63e1', # 'magic' text to tell depot_tools that git submodules should be accepted but # but parity with DEPS file is expected. @@ -161,7 +161,7 @@ vars = { deps = { 'build': { - 'url': Var('chromium_git') + '/chromium/src/build.git@1a25429fe387b16852cc3df666cea09052db2645', + 'url': Var('chromium_git') + '/chromium/src/build.git@4420c4de066ae0be84ca24c31006727526953aef', 'condition': 'not build_with_chromium', }, @@ -179,7 +179,7 @@ deps = { 'packages': [ { 'package': 'gn/gn/linux-${{arch}}', - 'version': 'git_revision:cc56a0f98bb34accd5323316e0292575ff17a5d4', + 'version': 'git_revision:991530ce394efb58fcd848195469022fa17ae126', } ], 'dep_type': 'cipd', @@ -190,7 +190,7 @@ deps = { 'packages': [ { 'package': 'gn/gn/mac-${{arch}}', - 'version': 'git_revision:cc56a0f98bb34accd5323316e0292575ff17a5d4', + 'version': 'git_revision:991530ce394efb58fcd848195469022fa17ae126', } ], 'dep_type': 'cipd', @@ -212,7 +212,7 @@ deps = { 'packages': [ { 'package': 'gn/gn/windows-amd64', - 'version': 'git_revision:cc56a0f98bb34accd5323316e0292575ff17a5d4', + 'version': 'git_revision:991530ce394efb58fcd848195469022fa17ae126', } ], 'dep_type': 'cipd', @@ -220,7 +220,7 @@ deps = { }, 'testing': { - 'url': '{chromium_git}/chromium/src/testing@ce02ccbb6e97ae08d6ca901e28de6bc23fe44e30', + 'url': '{chromium_git}/chromium/src/testing@f79e60f0377fab380513bbd7a552a27acee1d021', 'condition': 'not build_with_chromium', }, @@ -311,7 +311,7 @@ deps = { }, 'third_party/android_sdk': { - 'url': Var('chromium_git') + '/chromium/src/third_party/android_sdk@ff414082cc7b1f83c244ee8d8255ef2170d050a6', + 'url': Var('chromium_git') + '/chromium/src/third_party/android_sdk@7ebbd1ea9b4e78961b9b596e3f31f35f0e484904', 'condition': 'checkout_android and not build_with_chromium', }, @@ -403,7 +403,7 @@ deps = { }, 'third_party/depot_tools': { - 'url': Var('chromium_git') + '/chromium/tools/depot_tools.git@8babcb7e2ec9ffe4e0394a66378423242dd66e6c', + 'url': Var('chromium_git') + '/chromium/tools/depot_tools.git@bcba1782123e426901b0e436edf1c444ae5aeb70', 'condition': 'not build_with_chromium', }, @@ -522,12 +522,12 @@ deps = { }, 'third_party/libc++abi/src': { - 'url': Var('chromium_git') + '/external/github.com/llvm/llvm-project/libcxxabi.git@d5209a75b32df30ce604860a89b1539072ea605e', + 'url': Var('chromium_git') + '/external/github.com/llvm/llvm-project/libcxxabi.git@d3ed8c086cbe4db38cd0acaf51844a156c0e82a9', 'condition': 'not build_with_chromium', }, 'third_party/libunwind/src': { - 'url': Var('chromium_git') + '/external/github.com/llvm/llvm-project/libunwind.git@056857605576ac13534c972ff563d62aa7ff4275', + 'url': Var('chromium_git') + '/external/github.com/llvm/llvm-project/libunwind.git@d9b4abf6b6c3e4541766df4eedaf534ed1322a8e', 'condition': 'not build_with_chromium', }, @@ -604,7 +604,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/r8', - 'version': 'fR4aBtFTaohfSjV_Y54-1MC5dV2cTK7iZrFUiGoVivgC', + 'version': 'oP1tOCigL9cN6j-dfqmgRtMV5zOSZQ2IgaG11GSyNP0C', }, ], 'condition': 'checkout_android and not build_with_chromium', @@ -691,7 +691,7 @@ deps = { }, 'tools/android': { - 'url': Var('chromium_git') + '/chromium/src/tools/android@438abc2caadecb356e0c2f49878e1f5b8d898a94', + 'url': Var('chromium_git') + '/chromium/src/tools/android@4bead2e08bd2ea16b6cbdddc8c6f32a65956eb6b', 'condition': 'checkout_android and not build_with_chromium', }, @@ -727,7 +727,7 @@ deps = { }, 'tools/mb': { - 'url': Var('chromium_git') + '/chromium/src/tools/mb@bea25651453b8aa351244310ba34f44d97014533', + 'url': Var('chromium_git') + '/chromium/src/tools/mb@18e77c0dbda65036dadeae0d6c0d3a9ccd93f38a', 'condition': 'not build_with_chromium', }, diff --git a/build b/build index 1a25429fe..4420c4de0 160000 --- a/build +++ b/build @@ -1 +1 @@ -Subproject commit 1a25429fe387b16852cc3df666cea09052db2645 +Subproject commit 4420c4de066ae0be84ca24c31006727526953aef diff --git a/infra/specs/angle.json b/infra/specs/angle.json index 4e4cf31c6..ee0e451a1 100644 --- a/infra/specs/angle.json +++ b/infra/specs/angle.json @@ -3991,7 +3991,7 @@ "display_attached": "1", "gpu": "1002:67ef", "hidpi": "1", - "os": "Mac-13.2.1|Mac-13.5", + "os": "Mac-13.5", "pool": "chromium.tests.gpu" }, "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -4015,7 +4015,7 @@ "display_attached": "1", "gpu": "1002:67ef", "hidpi": "1", - "os": "Mac-13.2.1|Mac-13.5", + "os": "Mac-13.5", "pool": "chromium.tests.gpu" }, "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -4040,7 +4040,7 @@ "display_attached": "1", "gpu": "1002:67ef", "hidpi": "1", - "os": "Mac-13.2.1|Mac-13.5", + "os": "Mac-13.5", "pool": "chromium.tests.gpu" }, "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -4065,7 +4065,7 @@ "display_attached": "1", "gpu": "1002:67ef", "hidpi": "1", - "os": "Mac-13.2.1|Mac-13.5", + "os": "Mac-13.5", "pool": "chromium.tests.gpu" }, "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -4090,7 +4090,7 @@ "display_attached": "1", "gpu": "1002:67ef", "hidpi": "1", - "os": "Mac-13.2.1|Mac-13.5", + "os": "Mac-13.5", "pool": "chromium.tests.gpu" }, "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", @@ -4116,7 +4116,7 @@ "display_attached": "1", "gpu": "1002:67ef", "hidpi": "1", - "os": "Mac-13.2.1|Mac-13.5", + "os": "Mac-13.5", "pool": "chromium.tests.gpu" }, "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", @@ -4142,7 +4142,7 @@ "display_attached": "1", "gpu": "1002:67ef", "hidpi": "1", - "os": "Mac-13.2.1|Mac-13.5", + "os": "Mac-13.5", "pool": "chromium.tests.gpu" }, "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", @@ -4164,7 +4164,7 @@ "display_attached": "1", "gpu": "1002:67ef", "hidpi": "1", - "os": "Mac-13.2.1|Mac-13.5", + "os": "Mac-13.5", "pool": "chromium.tests.gpu" }, "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -4195,7 +4195,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-13.3.1|Mac-13.5" + "os": "Mac-13.5" }, "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, @@ -4217,7 +4217,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-13.3.1|Mac-13.5" + "os": "Mac-13.5" }, "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, @@ -4240,7 +4240,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-13.3.1|Mac-13.5" + "os": "Mac-13.5" }, "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, @@ -4263,7 +4263,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-13.3.1|Mac-13.5" + "os": "Mac-13.5" }, "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, @@ -4286,7 +4286,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-13.3.1|Mac-13.5" + "os": "Mac-13.5" }, "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", "shards": 2 @@ -4310,7 +4310,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-13.3.1|Mac-13.5" + "os": "Mac-13.5" }, "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", "shards": 2 @@ -4334,7 +4334,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-13.3.1|Mac-13.5" + "os": "Mac-13.5" }, "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", "shards": 2 @@ -4354,7 +4354,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-13.3.1|Mac-13.5" + "os": "Mac-13.5" }, "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" }, diff --git a/infra/specs/mixins.pyl b/infra/specs/mixins.pyl index 473563aa7..231ae455c 100644 --- a/infra/specs/mixins.pyl +++ b/infra/specs/mixins.pyl @@ -42,7 +42,7 @@ 'mac_mini_intel_gpu_stable': { 'swarming': { 'dimensions': { 'cpu': 'x86-64', 'display_attached': '1', 'gpu': '8086:3e9b', - 'os': 'Mac-13.3.1|Mac-13.5'}}}, + 'os': 'Mac-13.5'}}}, 'mac_retina_amd_gpu_experimental': { 'swarming': { 'dimensions': { 'cpu': 'x86-64', 'display_attached': '1', 'gpu': '1002:67ef', @@ -53,7 +53,7 @@ 'display_attached': '1', 'gpu': '1002:67ef', 'hidpi': '1', - 'os': 'Mac-13.2.1|Mac-13.5', + 'os': 'Mac-13.5', 'pool': 'chromium.tests.gpu'}}}, 'mac_retina_nvidia_gpu_experimental': { 'swarming': { 'dimensions': { 'cpu': 'x86-64', 'display_attached': '1', diff --git a/testing b/testing index ce02ccbb6..f79e60f03 160000 --- a/testing +++ b/testing @@ -1 +1 @@ -Subproject commit ce02ccbb6e97ae08d6ca901e28de6bc23fe44e30 +Subproject commit f79e60f0377fab380513bbd7a552a27acee1d021 diff --git a/third_party/android_sdk b/third_party/android_sdk index ff414082c..7ebbd1ea9 160000 --- a/third_party/android_sdk +++ b/third_party/android_sdk @@ -1 +1 @@ -Subproject commit ff414082cc7b1f83c244ee8d8255ef2170d050a6 +Subproject commit 7ebbd1ea9b4e78961b9b596e3f31f35f0e484904 diff --git a/third_party/catapult b/third_party/catapult index 4ca9d0910..ddbdff3f2 160000 --- a/third_party/catapult +++ b/third_party/catapult @@ -1 +1 @@ -Subproject commit 4ca9d0910a7d1fe1dbdf67c62c5753f36ba995cd +Subproject commit ddbdff3f2072e0fc960bc94d513759a8c45c2967 diff --git a/third_party/depot_tools b/third_party/depot_tools index 8babcb7e2..bcba17821 160000 --- a/third_party/depot_tools +++ b/third_party/depot_tools @@ -1 +1 @@ -Subproject commit 8babcb7e2ec9ffe4e0394a66378423242dd66e6c +Subproject commit bcba1782123e426901b0e436edf1c444ae5aeb70 diff --git a/third_party/libc++abi/src b/third_party/libc++abi/src index d5209a75b..d3ed8c086 160000 --- a/third_party/libc++abi/src +++ b/third_party/libc++abi/src @@ -1 +1 @@ -Subproject commit d5209a75b32df30ce604860a89b1539072ea605e +Subproject commit d3ed8c086cbe4db38cd0acaf51844a156c0e82a9 diff --git a/third_party/libunwind/src b/third_party/libunwind/src index 056857605..d9b4abf6b 160000 --- a/third_party/libunwind/src +++ b/third_party/libunwind/src @@ -1 +1 @@ -Subproject commit 056857605576ac13534c972ff563d62aa7ff4275 +Subproject commit d9b4abf6b6c3e4541766df4eedaf534ed1322a8e diff --git a/tools/android b/tools/android index 438abc2ca..4bead2e08 160000 --- a/tools/android +++ b/tools/android @@ -1 +1 @@ -Subproject commit 438abc2caadecb356e0c2f49878e1f5b8d898a94 +Subproject commit 4bead2e08bd2ea16b6cbdddc8c6f32a65956eb6b diff --git a/tools/mb b/tools/mb index bea256514..18e77c0db 160000 --- a/tools/mb +++ b/tools/mb @@ -1 +1 @@ -Subproject commit bea25651453b8aa351244310ba34f44d97014533 +Subproject commit 18e77c0dbda65036dadeae0d6c0d3a9ccd93f38a