commit 2b2e4476e7907e9656f90594c7ae57f20194c401
parent 9ea6681e142d4c7fab473fd02e6893b2ee057239
Author: Michael Froman <mfroman@mozilla.com>
Date: Thu, 9 Oct 2025 14:45:29 -0500
Bug 1993083 - Vendor libwebrtc from 01f5c85064
Upstream commit: https://webrtc.googlesource.com/src/+/01f5c850649873b4949582234d2d58cd118d900e
Expand autoroller error message if GCS objects dont match Chromium
Bug: None
Change-Id: I35bbce85606f9b0f30d71f3b7ba8e875ceca2e93
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/400521
Commit-Queue: Björn Terelius <terelius@webrtc.org>
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#45157}
Diffstat:
2 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/third_party/libwebrtc/README.mozilla.last-vendor b/third_party/libwebrtc/README.mozilla.last-vendor
@@ -1,4 +1,4 @@
# ./mach python dom/media/webrtc/third_party_build/vendor-libwebrtc.py --from-local /home/mfroman/mozilla/elm/.moz-fast-forward/moz-libwebrtc --commit mozpatches libwebrtc
-libwebrtc updated from /home/mfroman/mozilla/elm/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2025-10-09T19:44:17.229232+00:00.
+libwebrtc updated from /home/mfroman/mozilla/elm/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2025-10-09T19:45:20.053968+00:00.
# base of lastest vendoring
-aceb93ed87
+01f5c85064
diff --git a/third_party/libwebrtc/tools_webrtc/autoroller/roll_deps.py b/third_party/libwebrtc/tools_webrtc/autoroller/roll_deps.py
@@ -90,7 +90,11 @@ NOTIFY_EMAIL = 'webrtc-trooper@grotations.appspotmail.com'
GCS_OBJECTS_ERROR = (
'The number of objects in %s is different between '
- 'Chromium\'s DEPS and WebRTC\'s DEPS. They must be the same.')
+ 'Chromium\'s DEPS and WebRTC\'s DEPS. They must be the same.\n'
+ 'Old: %s\nNew: %s\n'
+ 'Manually update the DEPS file and add appropriate conditions for any new '
+ 'objects. Note that the order of objects matter and must be the same as in '
+ 'Chromium.')
sys.path.append(os.path.join(CHECKOUT_ROOT_DIR, 'build'))
import find_depot_tools
@@ -326,11 +330,12 @@ def BuildDepsentryDict(deps_dict):
def _FindChangedGcsPackage(path, old_pkg, new_pkg):
- assert len(old_pkg.objects) == len(new_pkg.objects), (GCS_OBJECTS_ERROR %
- path)
- current_version_str = ','.join(x['object_name'] for x in old_pkg.objects)
- new_version_str = ','.join(x['object_name'] for x in new_pkg.objects)
- if current_version_str != new_version_str:
+ old_object_names = [x['object_name'] for x in old_pkg.objects]
+ new_object_names = [x['object_name'] for x in new_pkg.objects]
+ assert len(old_pkg.objects) == len(
+ new_pkg.objects), (GCS_OBJECTS_ERROR %
+ (path, old_object_names, new_object_names))
+ if old_object_names != new_object_names:
objects = [
','.join([
o['object_name'], o['sha256sum'],
@@ -339,8 +344,8 @@ def _FindChangedGcsPackage(path, old_pkg, new_pkg):
]) for o in new_pkg.objects
]
setdep_arg = '%s@%s' % (path, '?'.join(objects))
- yield ChangedGcsPackage(path, setdep_arg, current_version_str,
- new_version_str)
+ yield ChangedGcsPackage(path, setdep_arg, ','.join(old_object_names),
+ ','.join(new_object_names))
def _FindChangedCipdPackages(path, old_pkgs, new_pkgs):
