diff options
author | Yuly Novikov <ynovikov@chromium.org> | 2024-04-23 13:57:45 +0000 |
---|---|---|
committer | Angle LUCI CQ <angle-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2024-04-23 15:59:46 +0000 |
commit | 94179bed1c110a6904b2c3794048214b4af9ea86 (patch) | |
tree | c851f1eee2a82d1d1d115d2abbf76134ae474e7d | |
parent | 0d1dab2cf11b93f358f22f7cf310d807aecdfc4b (diff) | |
download | angle-94179bed1c110a6904b2c3794048214b4af9ea86.tar.gz |
Roll chromium_revision 39c16b7a37..b00758dcbb (1290535:1290830)
Update scripts/roll_chromium_deps.py to ignore GCS DEPS entries.
Change log: https://chromium.googlesource.com/chromium/src/+log/39c16b7a37..b00758dcbb
Full diff: https://chromium.googlesource.com/chromium/src/+/39c16b7a37..b00758dcbb
Changed dependencies
* build: https://chromium.googlesource.com/chromium/src/build.git/+log/f381a5d258..c7d168ab6d
* buildtools: https://chromium.googlesource.com/chromium/src/buildtools.git/+log/5eb927f0a9..571c37f17d
* testing: https://chromium.googlesource.com/chromium/src/testing/+log/844489d5bf..fdc7df36c5
* third_party/depot_tools: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+log/6ba67afd6f..917a57459b
* tools/android: https://chromium.googlesource.com/chromium/src/tools/android/+log/31ab5f9786..628a8e6856
* tools/clang: https://chromium.googlesource.com/chromium/src/tools/clang.git/+log/e0d0c28dbe..bca0c9f60a
* tools/mb: https://chromium.googlesource.com/chromium/src/tools/mb/+log/8f37fed0b7..918fef0e46
* tools/perf: https://chromium.googlesource.com/chromium/src/tools/perf/+log/8bf48ae269..3f41393fee
DEPS diff: https://chromium.googlesource.com/chromium/src/+/39c16b7a37..b00758dcbb/DEPS
No update to Clang.
Bug: b/328065301
Change-Id: Ied690fe00ca0f82d4c5e17092ea96a6bc0f9b7d1
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/5476868
Reviewed-by: Solti Ho <solti@google.com>
Commit-Queue: Yuly Novikov <ynovikov@chromium.org>
-rw-r--r-- | DEPS | 18 | ||||
m--------- | build | 0 | ||||
m--------- | buildtools | 0 | ||||
-rwxr-xr-x | scripts/roll_chromium_deps.py | 3 | ||||
m--------- | testing | 0 | ||||
m--------- | third_party/depot_tools | 0 | ||||
m--------- | tools/android | 0 | ||||
m--------- | tools/clang | 0 | ||||
m--------- | tools/mb | 0 | ||||
m--------- | tools/perf | 0 |
10 files changed, 12 insertions, 9 deletions
@@ -43,7 +43,7 @@ vars = { 'checkout_angle_mesa': False, # Version of Chromium our Chromium-based DEPS are mirrored from. - 'chromium_revision': '39c16b7a37406d313976455738e4185a6e9e8d03', + 'chromium_revision': 'b00758dcbb7a1a512c2cdfed4a62d50d65a6a5dc', # We never want to checkout chromium, # but need a dummy DEPS entry for the autoroller 'dummy_checkout_chromium': False, @@ -414,12 +414,12 @@ vars = { deps = { 'build': { - 'url': Var('chromium_git') + '/chromium/src/build.git@f381a5d258f0eada4da4c4d5b542bc6359160171', + 'url': Var('chromium_git') + '/chromium/src/build.git@c7d168ab6d2622e714b19a5e65b940a505a04990', 'condition': 'not build_with_chromium', }, 'buildtools': { - 'url': Var('chromium_git') + '/chromium/src/buildtools.git@5eb927f0a922dfacf10cfa84ee76f39dcf2a7311', + 'url': Var('chromium_git') + '/chromium/src/buildtools.git@571c37f17dd4d1de37cc2efb6b32ff1032e47be2', 'condition': 'not build_with_chromium', }, @@ -473,7 +473,7 @@ deps = { }, 'testing': { - 'url': '{chromium_git}/chromium/src/testing@844489d5bf7389c5eaf4c8f5de6792dedfc0f691', + 'url': '{chromium_git}/chromium/src/testing@fdc7df36c567db7711bb8d78cf584fbc4db13e09', 'condition': 'not build_with_chromium', }, @@ -655,7 +655,7 @@ deps = { }, 'third_party/depot_tools': { - 'url': Var('chromium_git') + '/chromium/tools/depot_tools.git@6ba67afd6fb7718743af91b847ddf1907f3ee9a6', + 'url': Var('chromium_git') + '/chromium/tools/depot_tools.git@917a57459bc8e0fba776db9daa7eb4950bb497fe', 'condition': 'not build_with_chromium', }, @@ -958,12 +958,12 @@ deps = { }, 'tools/android': { - 'url': Var('chromium_git') + '/chromium/src/tools/android@31ab5f9786b2a9f16af8cdde21eabc27606dbd46', + 'url': Var('chromium_git') + '/chromium/src/tools/android@628a8e6856fbd0f8ca188de19724ae963e3483db', 'condition': 'checkout_android and not build_with_chromium', }, 'tools/clang': { - 'url': Var('chromium_git') + '/chromium/src/tools/clang.git@e0d0c28dbe379471d0e61c017291665a80310492', + 'url': Var('chromium_git') + '/chromium/src/tools/clang.git@bca0c9f60a365ef2294c42e216420c561093f06f', 'condition': 'not build_with_chromium', }, @@ -994,7 +994,7 @@ deps = { }, 'tools/mb': { - 'url': Var('chromium_git') + '/chromium/src/tools/mb@8f37fed0b77117dee23a82a66217fb4881fbc889', + 'url': Var('chromium_git') + '/chromium/src/tools/mb@918fef0e469d158c691256dea091c5df4674fb1d', 'condition': 'not build_with_chromium', }, @@ -1009,7 +1009,7 @@ deps = { }, 'tools/perf': { - 'url': Var('chromium_git') + '/chromium/src/tools/perf@8bf48ae26975dcbb083aea81d280edb90efad270', + 'url': Var('chromium_git') + '/chromium/src/tools/perf@3f41393fee08650dd70f699546cadb4dcddf2674', 'condition': 'not build_with_chromium', }, diff --git a/build b/build -Subproject f381a5d258f0eada4da4c4d5b542bc635916017 +Subproject c7d168ab6d2622e714b19a5e65b940a505a0499 diff --git a/buildtools b/buildtools -Subproject 5eb927f0a922dfacf10cfa84ee76f39dcf2a731 +Subproject 571c37f17dd4d1de37cc2efb6b32ff1032e47be diff --git a/scripts/roll_chromium_deps.py b/scripts/roll_chromium_deps.py index 700dd1815c..43dbf2c62c 100755 --- a/scripts/roll_chromium_deps.py +++ b/scripts/roll_chromium_deps.py @@ -310,6 +310,9 @@ def BuildDepsentryDict(deps_dict): dep = {'url': dep} if dep.get('dep_type') == 'cipd': result[path] = CipdDepsEntry(path, dep['packages']) + elif dep.get('dep_type') == 'gcs': + # Ignore GCS deps - there aren't any that we want to sync yet + continue else: if '@' not in dep['url']: continue diff --git a/testing b/testing -Subproject 844489d5bf7389c5eaf4c8f5de6792dedfc0f69 +Subproject fdc7df36c567db7711bb8d78cf584fbc4db13e0 diff --git a/third_party/depot_tools b/third_party/depot_tools -Subproject 6ba67afd6fb7718743af91b847ddf1907f3ee9a +Subproject 917a57459bc8e0fba776db9daa7eb4950bb497f diff --git a/tools/android b/tools/android -Subproject 31ab5f9786b2a9f16af8cdde21eabc27606dbd4 +Subproject 628a8e6856fbd0f8ca188de19724ae963e3483d diff --git a/tools/clang b/tools/clang -Subproject e0d0c28dbe379471d0e61c017291665a8031049 +Subproject bca0c9f60a365ef2294c42e216420c561093f06 diff --git a/tools/mb b/tools/mb -Subproject 8f37fed0b77117dee23a82a66217fb4881fbc88 +Subproject 918fef0e469d158c691256dea091c5df4674fb1 diff --git a/tools/perf b/tools/perf -Subproject 8bf48ae26975dcbb083aea81d280edb90efad27 +Subproject 3f41393fee08650dd70f699546cadb4dcddf267 |