mirror of
https://github.com/godotengine/godot-angle-static.git
synced 2026-01-01 05:48:11 +03:00
Roll Chromium from c83e966b4c7e to f7c2a70f23b1 (1902 revisions)
Disable Rust toolchain support in standalone ANGLE, to avoid unnecessary dependencies.c83e966b4c..f7c2a70f23If 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,geofflang@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:32e94e55de..052437a6e1* buildtools:0a6c69640f..c97a3b8902* buildtools/third_party/libc++/trunk:e44019bfac..26ace673c4* testing:f132d63e88..df3b0c9f14* third_party/android_deps:4189179faf..115fe1141d* third_party/android_sdk/public: 3Yn5Sn7BMObm8gsoZCF0loJMKg9_PpgU07G9DObCLdQC..EWnL2r7oV5GtE9Ef7GyohyFam42wtMtEKYU4dCb3U1YC * third_party/catapult: https://chromium.googlesource.com/catapult.git/+log/{catapult_..e838386fa0 * third_party/depot_tools:479e1e9055..df528a9d7a* third_party/fuchsia-sdk/sdk: version:12.20230322.3.1..version:12.20230327.3.1 * third_party/kotlin_stdlib: zeFlVAEGvnpaj3JJujWHzRlUiBEm4XeeaMQzVsdW6D4C..XON2v801ZWS7FjApXO8Ev7Me7cOsIAnmqzyCXJuMwJ0C * third_party/r8: EGf7RQo3stt-vPTw69TaMGuNtnOx0Dbk1O-MBquwswYC..BTs9W6pUBDK8YTePjjF3Q0-ZQo1snO7GBCT6frWMIj8C * tools/clang:7a7207a7f2..04d87bfe25* tools/luci-go: git_revision:320bf3ed60cd4d24549d0ea9ee3a94394f2665ce..git_revision:3569ebf36f17a991aa4d26fd6e228cdf6e664d13 * tools/luci-go: git_revision:320bf3ed60cd4d24549d0ea9ee3a94394f2665ce..git_revision:3569ebf36f17a991aa4d26fd6e228cdf6e664d13 * tools/mb:db6ffdf0ba..993b50afde* tools/memory:b55593f4dc..13f0b81ce5* tools/perf:b87bb2fac8..892ad5cc94* tools/skia_goldctl/linux: iQ7zKud-gha6r9hEdwqYWRdOpeAs6gFfDxnviDUt4FQC..CHIKK9YvBNPOM_lAlqkfs4dTTbM6I-AKggA94sfc5PoC * tools/skia_goldctl/mac_amd64: 9Wfje1bt82IO9pJokAt9lboy59X_Pe-s0b4EpmH7RT4C..Gwb7laBBhkBhwP1nIoAb1EwklQ5sEon7g7r76v7jAasC * tools/skia_goldctl/mac_arm64: zihT2Lk2afg0XzIZozuGcZXWv7RJujaDEi_6q7QL4DgC..Jh19SHnigVXYxpk7Fp4ZDMF_ZvLpQUie2NMaK5aEISMC * tools/skia_goldctl/win: we56UJIWxJJ2GkQ_ne0o3oGAr7FBJa5T5Jr1xguLn-gC..pUOVquC14y84RkNMzEAPw_7tztey-kvH7KBwGsFViuIC No update to Clang. Bug: chromium:1292038 Change-Id: Ie7f8204e241101673768257be9c003343bc47256 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/4376783 Reviewed-by: Geoff Lang <geofflang@chromium.org>
This commit is contained in:
committed by
Yuly Novikov
parent
bb15ceefd9
commit
219776e23c
3
.gn
3
.gn
@@ -44,6 +44,9 @@ default_args = {
|
||||
# Saves on importing extra dependencies and ANGLE doesn't use JS.
|
||||
enable_js_protobuf = false
|
||||
|
||||
# Saves on importing extra dependencies and ANGLE doesn't use Rust.
|
||||
enable_rust = false
|
||||
|
||||
# Disable location tags in isolates.
|
||||
tests_have_location_tags = false
|
||||
|
||||
|
||||
42
DEPS
42
DEPS
@@ -43,7 +43,7 @@ vars = {
|
||||
'checkout_angle_mesa': False,
|
||||
|
||||
# Version of Chromium our Chromium-based DEPS are mirrored from.
|
||||
'chromium_revision': 'c83e966b4c7e28953b1ca889c91faa409c4ecaa1',
|
||||
'chromium_revision': 'f7c2a70f23b1ed371b860092ad62177148c94b18',
|
||||
# We never want to checkout chromium,
|
||||
# but need a dummy DEPS entry for the autoroller
|
||||
'dummy_checkout_chromium': False,
|
||||
@@ -88,16 +88,16 @@ 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': '018d397758e54d6a6d3b6ddf28a1784664d63f83',
|
||||
'catapult_revision': 'e838386fa052bd38ad2f7f46fd04e451ce110324',
|
||||
|
||||
# the commit queue can handle CLs rolling Fuchsia sdk
|
||||
# and whatever else without interference from each other.
|
||||
'fuchsia_version': 'version:12.20230322.3.1',
|
||||
'fuchsia_version': 'version:12.20230327.3.1',
|
||||
|
||||
# Three lines of non-changing comments so that
|
||||
# the commit queue can handle CLs rolling luci-go
|
||||
# and whatever else without interference from each other.
|
||||
'luci_go': 'git_revision:320bf3ed60cd4d24549d0ea9ee3a94394f2665ce',
|
||||
'luci_go': 'git_revision:3569ebf36f17a991aa4d26fd6e228cdf6e664d13',
|
||||
|
||||
# Three lines of non-changing comments so that
|
||||
# the commit queue can handle CLs rolling android_sdk_build-tools_version
|
||||
@@ -140,12 +140,12 @@ vars = {
|
||||
deps = {
|
||||
|
||||
'build': {
|
||||
'url': '{chromium_git}/chromium/src/build.git@32e94e55de4dd65c55ab13cf4737b2b97a8e3241',
|
||||
'url': '{chromium_git}/chromium/src/build.git@052437a6e1026cdd12607e3c5b4438ed90546d09',
|
||||
'condition': 'not build_with_chromium',
|
||||
},
|
||||
|
||||
'buildtools': {
|
||||
'url': '{chromium_git}/chromium/src/buildtools.git@0a6c69640f1841d9109eac70a25af310d4c1d8c7',
|
||||
'url': '{chromium_git}/chromium/src/buildtools.git@c97a3b8902379b6e6f705202db03d415d790ebac',
|
||||
'condition': 'not build_with_chromium',
|
||||
},
|
||||
|
||||
@@ -177,7 +177,7 @@ deps = {
|
||||
},
|
||||
|
||||
'buildtools/third_party/libc++/trunk': {
|
||||
'url': '{chromium_git}/external/github.com/llvm/llvm-project/libcxx.git@e44019bfac2b2d3ebe1618628884f85c8600e322',
|
||||
'url': '{chromium_git}/external/github.com/llvm/llvm-project/libcxx.git@26ace673c4b9c7a352fa9db182256bb341b6c44f',
|
||||
'condition': 'not build_with_chromium',
|
||||
},
|
||||
|
||||
@@ -203,7 +203,7 @@ deps = {
|
||||
},
|
||||
|
||||
'testing': {
|
||||
'url': '{chromium_git}/chromium/src/testing@f132d63e88b346fe751d0f48b769a179cb061b94',
|
||||
'url': '{chromium_git}/chromium/src/testing@df3b0c9f14ea0966edb997afa8aba3ec14929752',
|
||||
'condition': 'not build_with_chromium',
|
||||
},
|
||||
|
||||
@@ -273,7 +273,7 @@ deps = {
|
||||
},
|
||||
|
||||
'third_party/android_deps': {
|
||||
'url': '{chromium_git}/chromium/src/third_party/android_deps@4189179fafa56a79d7eac3246c18f7166a8519a5',
|
||||
'url': '{chromium_git}/chromium/src/third_party/android_deps@115fe1141d2bfc481e95000528ef6a9bd563c025',
|
||||
'condition': 'checkout_android and not build_with_chromium',
|
||||
},
|
||||
|
||||
@@ -329,7 +329,7 @@ deps = {
|
||||
},
|
||||
{
|
||||
'package': 'chromium/third_party/android_sdk/public/cmdline-tools',
|
||||
'version': '3Yn5Sn7BMObm8gsoZCF0loJMKg9_PpgU07G9DObCLdQC',
|
||||
'version': 'EWnL2r7oV5GtE9Ef7GyohyFam42wtMtEKYU4dCb3U1YC',
|
||||
},
|
||||
],
|
||||
'condition': 'checkout_android_native_support and not build_with_chromium',
|
||||
@@ -380,7 +380,7 @@ deps = {
|
||||
},
|
||||
|
||||
'third_party/depot_tools': {
|
||||
'url': '{chromium_git}/chromium/tools/depot_tools.git@479e1e9055020c8d1351bf2194d0a606aeca93d5',
|
||||
'url': '{chromium_git}/chromium/tools/depot_tools.git@df528a9d7a40d52f0cf0b61cf21e1e298f67860a',
|
||||
'condition': 'not build_with_chromium',
|
||||
},
|
||||
|
||||
@@ -437,7 +437,7 @@ deps = {
|
||||
'packages': [
|
||||
{
|
||||
'package': 'chromium/third_party/kotlin_stdlib',
|
||||
'version': 'zeFlVAEGvnpaj3JJujWHzRlUiBEm4XeeaMQzVsdW6D4C',
|
||||
'version': 'XON2v801ZWS7FjApXO8Ev7Me7cOsIAnmqzyCXJuMwJ0C',
|
||||
},
|
||||
],
|
||||
'condition': 'checkout_android and not build_with_chromium',
|
||||
@@ -588,7 +588,7 @@ deps = {
|
||||
'packages': [
|
||||
{
|
||||
'package': 'chromium/third_party/r8',
|
||||
'version': 'EGf7RQo3stt-vPTw69TaMGuNtnOx0Dbk1O-MBquwswYC',
|
||||
'version': 'BTs9W6pUBDK8YTePjjF3Q0-ZQo1snO7GBCT6frWMIj8C',
|
||||
},
|
||||
],
|
||||
'condition': 'checkout_android and not build_with_chromium',
|
||||
@@ -669,7 +669,7 @@ deps = {
|
||||
},
|
||||
|
||||
'tools/clang': {
|
||||
'url': '{chromium_git}/chromium/src/tools/clang.git@7a7207a7f2eb0f7f5c9f304a51077a2fd504b3ed',
|
||||
'url': '{chromium_git}/chromium/src/tools/clang.git@04d87bfe25c1c57fd9d7b52479329cede1e5e8e7',
|
||||
'condition': 'not build_with_chromium',
|
||||
},
|
||||
|
||||
@@ -700,7 +700,7 @@ deps = {
|
||||
},
|
||||
|
||||
'tools/mb': {
|
||||
'url': '{chromium_git}/chromium/src/tools/mb@db6ffdf0ba36c7142f7492daf803e18745801531',
|
||||
'url': '{chromium_git}/chromium/src/tools/mb@993b50afdeed64b2c785d96c094c7bb2eeaf1225',
|
||||
'condition': 'not build_with_chromium',
|
||||
},
|
||||
|
||||
@@ -710,12 +710,12 @@ deps = {
|
||||
},
|
||||
|
||||
'tools/memory': {
|
||||
'url': '{chromium_git}/chromium/src/tools/memory@b55593f4dc40ec73d72be2d82de64294e98dd342',
|
||||
'url': '{chromium_git}/chromium/src/tools/memory@13f0b81ce581364c5f0f2e9e16d6120073dc56a6',
|
||||
'condition': 'not build_with_chromium',
|
||||
},
|
||||
|
||||
'tools/perf': {
|
||||
'url': '{chromium_git}/chromium/src/tools/perf@b87bb2fac896aeadb12dbf01256a5a9094900428',
|
||||
'url': '{chromium_git}/chromium/src/tools/perf@892ad5cc9432112d5810a89c1113bc227bec58df',
|
||||
'condition': 'not build_with_chromium',
|
||||
},
|
||||
|
||||
@@ -733,7 +733,7 @@ deps = {
|
||||
'packages': [
|
||||
{
|
||||
'package': 'skia/tools/goldctl/linux-amd64',
|
||||
'version': 'iQ7zKud-gha6r9hEdwqYWRdOpeAs6gFfDxnviDUt4FQC',
|
||||
'version': 'CHIKK9YvBNPOM_lAlqkfs4dTTbM6I-AKggA94sfc5PoC',
|
||||
},
|
||||
],
|
||||
'dep_type': 'cipd',
|
||||
@@ -744,7 +744,7 @@ deps = {
|
||||
'packages': [
|
||||
{
|
||||
'package': 'skia/tools/goldctl/windows-amd64',
|
||||
'version': 'we56UJIWxJJ2GkQ_ne0o3oGAr7FBJa5T5Jr1xguLn-gC',
|
||||
'version': 'pUOVquC14y84RkNMzEAPw_7tztey-kvH7KBwGsFViuIC',
|
||||
},
|
||||
],
|
||||
'dep_type': 'cipd',
|
||||
@@ -755,7 +755,7 @@ deps = {
|
||||
'packages': [
|
||||
{
|
||||
'package': 'skia/tools/goldctl/mac-amd64',
|
||||
'version': '9Wfje1bt82IO9pJokAt9lboy59X_Pe-s0b4EpmH7RT4C',
|
||||
'version': 'Gwb7laBBhkBhwP1nIoAb1EwklQ5sEon7g7r76v7jAasC',
|
||||
},
|
||||
],
|
||||
'dep_type': 'cipd',
|
||||
@@ -766,7 +766,7 @@ deps = {
|
||||
'packages': [
|
||||
{
|
||||
'package': 'skia/tools/goldctl/mac-arm64',
|
||||
'version': 'zihT2Lk2afg0XzIZozuGcZXWv7RJujaDEi_6q7QL4DgC',
|
||||
'version': 'Jh19SHnigVXYxpk7Fp4ZDMF_ZvLpQUie2NMaK5aEISMC',
|
||||
},
|
||||
],
|
||||
'dep_type': 'cipd',
|
||||
|
||||
@@ -16,5 +16,5 @@
|
||||
"testing/buildbot/generate_buildbot_json.py":
|
||||
"55e41e1e8f931bdcba3518521567b2b5",
|
||||
"testing/buildbot/mixins.pyl":
|
||||
"9765261683345b3f3acd9b468b1f2416"
|
||||
"a6a4d9ca73a132f7e74d18c867a195ea"
|
||||
}
|
||||
Reference in New Issue
Block a user