commit 33ff566fc88d2e1bde3557f621aefc47adb3253f
parent cd0213b485892fad5d8f61e6620c330089581a36
Author: Dan Baker <dbaker@mozilla.com>
Date: Mon, 1 Dec 2025 16:40:17 -0700
Bug 2000941 - Vendor libwebrtc from 5b274054af
Upstream commit: https://webrtc.googlesource.com/src/+/5b274054af552689fefcb20b08428c2d44fa0354
Add a PACKAGE for webrtc luci config.star.
Goal was to reuse chromium's xcode version but the information has been removed from the shared library in https://chromium-review.googlesource.com/c/infra/chromium/+/6725714.
Change-Id: I713722b51e608e8335f89375413debac451bbbba
Bug: None
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/408003
Commit-Queue: Jeremy Leconte <jleconte@google.com>
Reviewed-by: Christoffer Dewerin <jansson@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#45565}
Diffstat:
5 files changed, 77 insertions(+), 12 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 /Users/danielbaker/elm/.moz-fast-forward/moz-libwebrtc --commit mozpatches libwebrtc
-libwebrtc updated from /Users/danielbaker/elm/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2025-12-01T23:37:12.225548+00:00.
+libwebrtc updated from /Users/danielbaker/elm/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2025-12-01T23:40:05.018771+00:00.
# base of lastest vendoring
-c5db2db15a
+5b274054af
diff --git a/third_party/libwebrtc/infra/config/PACKAGE.lock b/third_party/libwebrtc/infra/config/PACKAGE.lock
@@ -0,0 +1,29 @@
+{
+ "lucicfg": "1.45.8",
+ "packages": [
+ {
+ "name": "@webrtc-project",
+ "deps": [
+ "@chromium-luci"
+ ],
+ "lucicfg": "1.30.9",
+ "resources": [
+ "console-header.textpb",
+ "luci-analysis.cfg",
+ "luci-notify/email-templates/*"
+ ],
+ "entrypoints": [
+ "config.star"
+ ]
+ },
+ {
+ "name": "@chromium-luci",
+ "source": {
+ "repo": "https://chromium.googlesource.com/infra/chromium/+/refs/heads/main",
+ "revision": "04cdad5911e5d091eba42fc1ede0dd08b9261166",
+ "path": "starlark-libs/chromium-luci"
+ },
+ "lucicfg": "1.45.0"
+ }
+ ]
+}
diff --git a/third_party/libwebrtc/infra/config/PACKAGE.star b/third_party/libwebrtc/infra/config/PACKAGE.star
@@ -0,0 +1,39 @@
+#!/usr/bin/env lucicfg
+
+# Copyright (c) 2025 The WebRTC project authors. All Rights Reserved.
+#
+# Use of this source code is governed by a BSD-style license
+# that can be found in the LICENSE file in the root of the source
+# tree. An additional intellectual property rights grant can be found
+# in the file PATENTS. All contributing project authors may
+# be found in the AUTHORS file in the root of the source tree.
+
+"""Package declaration for the WebRTC project."""
+
+pkg.declare(
+ name = "@webrtc-project",
+ lucicfg = "1.30.9",
+)
+
+pkg.entrypoint("config.star")
+
+pkg.options.lint_checks([
+ "default",
+])
+
+pkg.depend(
+ name = "@chromium-luci",
+ source = pkg.source.googlesource(
+ host = "chromium",
+ repo = "infra/chromium",
+ ref = "refs/heads/main",
+ path = "starlark-libs/chromium-luci",
+ revision = "04cdad5911e5d091eba42fc1ede0dd08b9261166",
+ ),
+)
+
+pkg.resources([
+ "console-header.textpb",
+ "luci-analysis.cfg",
+ "luci-notify/email-templates/*",
+])
diff --git a/third_party/libwebrtc/infra/config/config.star b/third_party/libwebrtc/infra/config/config.star
@@ -12,7 +12,7 @@
"""LUCI project configuration for WebRTC CQ and CI."""
-lucicfg.check_version("1.30.9")
+load("@chromium-luci//xcode.star", "xcode")
WEBRTC_GIT = "https://webrtc.googlesource.com/src"
WEBRTC_GERRIT = "https://webrtc-review.googlesource.com/src"
@@ -86,7 +86,6 @@ lucicfg.config(
"project.cfg",
"realms.cfg",
],
- lint_checks = ["default"],
)
luci.project(
@@ -456,10 +455,10 @@ luci.tree_closer(
# Recipe definitions:
-def recipe(recipe, pkg = "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"):
+def recipe(recipe):
return luci.recipe(
name = recipe.split("/")[-1],
- cipd_package = pkg,
+ cipd_package = "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",
cipd_version = "refs/heads/main",
recipe = recipe,
)
@@ -471,7 +470,7 @@ recipe("webrtc/ios_api_framework")
recipe("webrtc/libfuzzer")
recipe("webrtc/standalone")
recipe("webrtc/update_webrtc_binary_version")
-recipe("lkgr_finder", pkg = "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build")
+recipe("lkgr_finder")
# Console definitions:
@@ -728,11 +727,8 @@ def normal_builder_factory(**common_kwargs):
# Mixins:
ios_builder, ios_try_job = normal_builder_factory(
- properties = {"xcode_build_version": WEBRTC_XCODE},
- caches = [swarming.cache(
- name = "xcode_ios_" + WEBRTC_XCODE,
- path = "xcode_ios_" + WEBRTC_XCODE + ".app",
- )],
+ properties = {"xcode_build_version": xcode.for_ios(WEBRTC_XCODE).version},
+ caches = [xcode.for_ios(WEBRTC_XCODE).cache],
)
# Actual builder configuration:
diff --git a/third_party/libwebrtc/infra/config/project.cfg b/third_party/libwebrtc/infra/config/project.cfg
@@ -8,6 +8,7 @@ name: "webrtc"
access: "group:all"
lucicfg {
version: "1.45.8"
+ package_name: "@webrtc-project"
package_dir: "."
config_dir: "."
entry_point: "config.star"
