Skip to content

Commit

Permalink
Roll chromium_revision 865aca6c93..e9b6b20cee (1315671:1316480)
Browse files Browse the repository at this point in the history
Manual roll changing 'src/third_party/ninja'
from 'infra/3pp/tools/ninja/${{platform}}'
to 'infra/3pp/build_support/ninja-1_11_1/${{platform}}'

Change log: https://chromium.googlesource.com/chromium/src/+log/865aca6c93..e9b6b20cee
Full diff: https://chromium.googlesource.com/chromium/src/+/865aca6c93..e9b6b20cee

Changed dependencies
* build: https://chromium.googlesource.com/chromium/src/build.git/+log/a155e2b423..00b3ce0aad
* buildtools: https://chromium.googlesource.com/chromium/src/buildtools.git/+log/8acbed5185..7817c353d0
* testing: https://chromium.googlesource.com/chromium/src/testing/+log/b53e9bcaf7..7521f3b99c
* third_party/catapult: https://chromium.googlesource.com/catapult.git/+log/68fe632a00..1a0040059f
* third_party/depot_tools: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+log/1d1f17af89..66df2a3ec7
* third_party/libc++/src: https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git/+log/6caebae1eb..3be02c8f02
* third_party/libc++abi/src: https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git/+log/43dd5b4bf6..472d9aad97
* third_party/ninja: version:[email protected]:[email protected]
* third_party/r8: dhoEB5vFXAD1JsD0RjBHaB3DLb1UbuHu0kptrpbcQA8C..2QksVhXOjZcs9S9ykH1cjssi-oJvf0xS8-t299KukjwC
* third_party/turbine: 1kLxPxWBXSIEOzQ1Zzi1M9XXu6pwfDbKCzQrNyGcCCEC..s6-zuFNzLDZOl_FmPkk2_LENOqUKjkYmpqR9l0SDo94C
* tools/clang: https://chromium.googlesource.com/chromium/src/tools/clang.git/+log/9adebe51ce..4336d0b16d
* tools/mb: https://chromium.googlesource.com/chromium/src/tools/mb/+log/ec19154875..553093afa4
* tools/perf: https://chromium.googlesource.com/chromium/src/tools/perf/+log/bf02c87e73..b835a09cd9
DEPS diff: https://chromium.googlesource.com/chromium/src/+/865aca6c93..e9b6b20cee/DEPS

No update to Clang.

Bug: None
Change-Id: Ib8a0edaa35aafa78fae5c90fec4de3592cbdc5b7
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/5638711
Commit-Queue: Yuly Novikov <[email protected]>
Reviewed-by: Roman Lavrov <[email protected]>
  • Loading branch information
y-novikov authored and Angle LUCI CQ committed Jun 18, 2024
1 parent e1f0cb9 commit 223027e
Show file tree
Hide file tree
Showing 11 changed files with 25 additions and 25 deletions.
30 changes: 15 additions & 15 deletions DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ vars = {
'checkout_angle_mesa': False,

# Version of Chromium our Chromium-based DEPS are mirrored from.
'chromium_revision': '865aca6c93b13c4387841eddb9af834afa7b6b95',
'chromium_revision': 'e9b6b20cee414c9a070bcb9e891f90e556ddc97a',
# We never want to checkout chromium,
# but need a dummy DEPS entry for the autoroller
'dummy_checkout_chromium': False,
Expand Down Expand Up @@ -88,7 +88,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': '68fe632a004e438f1f20f13e435fc27412562c99',
'catapult_revision': '1a0040059f507232fecfba0fc6982c73f81edbb8',

# the commit queue can handle CLs rolling Fuchsia sdk
# and whatever else without interference from each other.
Expand Down Expand Up @@ -118,7 +118,7 @@ vars = {

# ninja CIPD package version.
# https://chrome-infra-packages.appspot.com/p/infra/3pp/tools/ninja
'ninja_version': 'version:[email protected].6',
'ninja_version': 'version:[email protected].1',

# Fetch configuration files required for the 'use_remoteexec' gn arg
'download_remoteexec_cfg': False,
Expand Down Expand Up @@ -415,12 +415,12 @@ vars = {
deps = {

'build': {
'url': Var('chromium_git') + '/chromium/src/build.git@a155e2b42375eb2f1ec9806ffddc343643cc1206',
'url': Var('chromium_git') + '/chromium/src/build.git@00b3ce0aadb3827aa59227a7a4c89e33e787886f',
'condition': 'not build_with_chromium',
},

'buildtools': {
'url': Var('chromium_git') + '/chromium/src/buildtools.git@8acbed51859808fe82c5c4c079efe05a012ea041',
'url': Var('chromium_git') + '/chromium/src/buildtools.git@7817c353d060281937d1c8b59004af11dcc95884',
'condition': 'not build_with_chromium',
},

Expand Down Expand Up @@ -474,7 +474,7 @@ deps = {
},

'testing': {
'url': '{chromium_git}/chromium/src/testing@b53e9bcaf78e56189c7da0baae8704bdc15cb82b',
'url': '{chromium_git}/chromium/src/testing@7521f3b99ca11c493ff1654394e589b5ce24b2a8',
'condition': 'not build_with_chromium',
},

Expand Down Expand Up @@ -656,7 +656,7 @@ deps = {
},

'third_party/depot_tools': {
'url': Var('chromium_git') + '/chromium/tools/depot_tools.git@1d1f17af898bc5158fb1128952894ac061b06f56',
'url': Var('chromium_git') + '/chromium/tools/depot_tools.git@66df2a3ec70d0628d47df1fdba69838a870a1303',
'condition': 'not build_with_chromium',
},

Expand Down Expand Up @@ -775,12 +775,12 @@ deps = {
},

'third_party/libc++/src': {
'url': Var('chromium_git') + '/external/github.com/llvm/llvm-project/libcxx.git@6caebae1ebab6e0ac7db95d732a60035f26c6b89',
'url': Var('chromium_git') + '/external/github.com/llvm/llvm-project/libcxx.git@3be02c8f029027e954c805c01ba9f9906fd3d55d',
'condition': 'not build_with_chromium',
},

'third_party/libc++abi/src': {
'url': Var('chromium_git') + '/external/github.com/llvm/llvm-project/libcxxabi.git@43dd5b4bf62e8593461dce9a95e3d43fdcd0b9f2',
'url': Var('chromium_git') + '/external/github.com/llvm/llvm-project/libcxxabi.git@472d9aad97ad38d294aa0634100a4a1c0b6b34b9',
'condition': 'not build_with_chromium',
},

Expand Down Expand Up @@ -814,7 +814,7 @@ deps = {
'third_party/ninja': {
'packages': [
{
'package': 'infra/3pp/tools/ninja/${{platform}}',
'package': 'infra/3pp/build_support/ninja-1_11_1/${{platform}}',
'version': Var('ninja_version'),
}
],
Expand Down Expand Up @@ -872,7 +872,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/r8',
'version': 'dhoEB5vFXAD1JsD0RjBHaB3DLb1UbuHu0kptrpbcQA8C',
'version': '2QksVhXOjZcs9S9ykH1cjssi-oJvf0xS8-t299KukjwC',
},
],
'condition': 'checkout_android and not build_with_chromium',
Expand Down Expand Up @@ -927,7 +927,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/turbine',
'version': '1kLxPxWBXSIEOzQ1Zzi1M9XXu6pwfDbKCzQrNyGcCCEC',
'version': 's6-zuFNzLDZOl_FmPkk2_LENOqUKjkYmpqR9l0SDo94C',
},
],
'condition': 'checkout_android and not build_with_chromium',
Expand Down Expand Up @@ -1009,7 +1009,7 @@ deps = {
},

'tools/clang': {
'url': Var('chromium_git') + '/chromium/src/tools/clang.git@9adebe51cefd54e1ed9d413992f7dbda77a68832',
'url': Var('chromium_git') + '/chromium/src/tools/clang.git@4336d0b16d1bd1bfa26fac1a679c3872fa109d7e',
'condition': 'not build_with_chromium',
},

Expand Down Expand Up @@ -1040,7 +1040,7 @@ deps = {
},

'tools/mb': {
'url': Var('chromium_git') + '/chromium/src/tools/mb@ec19154875a2d7a6c128c40e482993011cffce11',
'url': Var('chromium_git') + '/chromium/src/tools/mb@553093afa42f8cf16c0a038fbe2bc8614c124887',
'condition': 'not build_with_chromium',
},

Expand All @@ -1055,7 +1055,7 @@ deps = {
},

'tools/perf': {
'url': Var('chromium_git') + '/chromium/src/tools/perf@bf02c87e730c537fa585caa894ab0c3db5df260f',
'url': Var('chromium_git') + '/chromium/src/tools/perf@b835a09cd99ffa21d4bef57c8db36b4407ff1c9a',
'condition': 'not build_with_chromium',
},

Expand Down
2 changes: 1 addition & 1 deletion build
Submodule build updated from a155e2 to 00b3ce
2 changes: 1 addition & 1 deletion buildtools
Submodule buildtools updated from 8acbed to 7817c3
2 changes: 1 addition & 1 deletion testing
Submodule testing updated from b53e9b to 7521f3
2 changes: 1 addition & 1 deletion third_party/catapult
Submodule catapult updated from 68fe63 to 1a0040
2 changes: 1 addition & 1 deletion third_party/depot_tools
Submodule depot_tools updated from 1d1f17 to 66df2a
2 changes: 1 addition & 1 deletion third_party/libc++/src
Submodule src updated from 6caeba to 3be02c
2 changes: 1 addition & 1 deletion third_party/libc++abi/src
Submodule src updated from 43dd5b to 472d9a
2 changes: 1 addition & 1 deletion tools/clang
Submodule clang updated from 9adebe to 4336d0
2 changes: 1 addition & 1 deletion tools/mb
Submodule mb updated from ec1915 to 553093
2 changes: 1 addition & 1 deletion tools/perf
Submodule perf updated from bf02c8 to b835a0

0 comments on commit 223027e

Please sign in to comment.