commit 901eff883d2102e83a83b84768dfaed760aff02c
parent a25ed637b0c371b250aa1f5502ab40a5f625b2d0
Author: Dan Baker <dbaker@mozilla.com>
Date: Thu, 20 Nov 2025 13:32:33 -0700
Bug 2000941 - Vendor libwebrtc from ac336010d8
Upstream commit: https://webrtc.googlesource.com/src/+/ac336010d8885dce427055bb9f94391a8cadeca1
Change to xcode_26_main and use arm bots for iOS
Bug: b/442993615
Change-Id: If7e5b110b1890b02ee5628b5fb5c74e3327b3977
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/407801
Commit-Queue: Christoffer Dewerin <jansson@webrtc.org>
Reviewed-by: Jeremy Leconte <jleconte@google.com>
Cr-Commit-Position: refs/heads/main@{#45555}
Diffstat:
10 files changed, 441 insertions(+), 461 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-11-20T20:29:59.215905+00:00.
+libwebrtc updated from /Users/danielbaker/elm/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2025-11-20T20:32:20.236468+00:00.
# base of lastest vendoring
-61fa06fcd2
+ac336010d8
diff --git a/third_party/libwebrtc/infra/config/config.star b/third_party/libwebrtc/infra/config/config.star
@@ -17,7 +17,7 @@ lucicfg.check_version("1.30.9")
WEBRTC_GIT = "https://webrtc.googlesource.com/src"
WEBRTC_GERRIT = "https://webrtc-review.googlesource.com/src"
WEBRTC_TROOPER_EMAIL = "webrtc-troopers-robots@google.com"
-WEBRTC_XCODE = "17a5305f"
+WEBRTC_XCODE = "17a5305k"
DEFAULT_CPU = "x86-64"
# Helpers:
diff --git a/third_party/libwebrtc/infra/config/cr-buildbucket.cfg b/third_party/libwebrtc/infra/config/cr-buildbucket.cfg
@@ -1019,13 +1019,13 @@ buckets {
properties_j: "$build/siso:{\"configs\":[\"builder\"],\"enable_cloud_profiler\":true,\"enable_cloud_trace\":true,\"enable_monitoring\":true,\"project\":\"rbe-webrtc-trusted\"}"
properties_j: "$recipe_engine/resultdb/test_presentation:{\"column_keys\":[],\"grouping_keys\":[\"status\",\"v.test_suite\"]}"
properties_j: "builder_group:\"client.webrtc\""
- properties_j: "xcode_build_version:\"17a5305f\""
+ properties_j: "xcode_build_version:\"17a5305k\""
}
priority: 29
execution_timeout_secs: 7200
caches {
- name: "xcode_ios_17a5305f"
- path: "xcode_ios_17a5305f.app"
+ name: "xcode_ios_17a5305k"
+ path: "xcode_ios_17a5305k.app"
}
build_numbers: YES
service_account: "webrtc-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -1054,13 +1054,13 @@ buckets {
properties_j: "$build/siso:{\"configs\":[\"builder\"],\"enable_cloud_profiler\":true,\"enable_cloud_trace\":true,\"enable_monitoring\":true,\"project\":\"rbe-webrtc-trusted\"}"
properties_j: "$recipe_engine/resultdb/test_presentation:{\"column_keys\":[],\"grouping_keys\":[\"status\",\"v.test_suite\"]}"
properties_j: "builder_group:\"client.webrtc\""
- properties_j: "xcode_build_version:\"17a5305f\""
+ properties_j: "xcode_build_version:\"17a5305k\""
}
priority: 30
execution_timeout_secs: 7200
caches {
- name: "xcode_ios_17a5305f"
- path: "xcode_ios_17a5305f.app"
+ name: "xcode_ios_17a5305k"
+ path: "xcode_ios_17a5305k.app"
}
build_numbers: YES
service_account: "webrtc-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -1089,13 +1089,13 @@ buckets {
properties_j: "$build/siso:{\"configs\":[\"builder\"],\"enable_cloud_profiler\":true,\"enable_cloud_trace\":true,\"enable_monitoring\":true,\"project\":\"rbe-webrtc-trusted\"}"
properties_j: "$recipe_engine/resultdb/test_presentation:{\"column_keys\":[],\"grouping_keys\":[\"status\",\"v.test_suite\"]}"
properties_j: "builder_group:\"client.webrtc\""
- properties_j: "xcode_build_version:\"17a5305f\""
+ properties_j: "xcode_build_version:\"17a5305k\""
}
priority: 30
execution_timeout_secs: 7200
caches {
- name: "xcode_ios_17a5305f"
- path: "xcode_ios_17a5305f.app"
+ name: "xcode_ios_17a5305k"
+ path: "xcode_ios_17a5305k.app"
}
build_numbers: YES
service_account: "webrtc-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -1124,13 +1124,13 @@ buckets {
properties_j: "$build/siso:{\"configs\":[\"builder\"],\"enable_cloud_profiler\":true,\"enable_cloud_trace\":true,\"enable_monitoring\":true,\"project\":\"rbe-webrtc-trusted\"}"
properties_j: "$recipe_engine/resultdb/test_presentation:{\"column_keys\":[],\"grouping_keys\":[\"status\",\"v.test_suite\"]}"
properties_j: "builder_group:\"client.webrtc\""
- properties_j: "xcode_build_version:\"17a5305f\""
+ properties_j: "xcode_build_version:\"17a5305k\""
}
priority: 30
execution_timeout_secs: 7200
caches {
- name: "xcode_ios_17a5305f"
- path: "xcode_ios_17a5305f.app"
+ name: "xcode_ios_17a5305k"
+ path: "xcode_ios_17a5305k.app"
}
build_numbers: YES
service_account: "webrtc-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -2150,13 +2150,13 @@ buckets {
properties_j: "$build/siso:{\"configs\":[\"builder\"],\"enable_cloud_profiler\":true,\"enable_cloud_trace\":true,\"enable_monitoring\":true,\"project\":\"rbe-webrtc-untrusted\"}"
properties_j: "$recipe_engine/resultdb/test_presentation:{\"column_keys\":[],\"grouping_keys\":[\"status\",\"v.test_suite\"]}"
properties_j: "builder_group:\"tryserver.webrtc\""
- properties_j: "xcode_build_version:\"17a5305f\""
+ properties_j: "xcode_build_version:\"17a5305k\""
}
priority: 30
execution_timeout_secs: 7200
caches {
- name: "xcode_ios_17a5305f"
- path: "xcode_ios_17a5305f.app"
+ name: "xcode_ios_17a5305k"
+ path: "xcode_ios_17a5305k.app"
}
build_numbers: YES
service_account: "webrtc-try-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -2185,13 +2185,13 @@ buckets {
properties_j: "$build/siso:{\"configs\":[\"builder\"],\"enable_cloud_profiler\":true,\"enable_cloud_trace\":true,\"enable_monitoring\":true,\"project\":\"rbe-webrtc-untrusted\"}"
properties_j: "$recipe_engine/resultdb/test_presentation:{\"column_keys\":[],\"grouping_keys\":[\"status\",\"v.test_suite\"]}"
properties_j: "builder_group:\"tryserver.webrtc\""
- properties_j: "xcode_build_version:\"17a5305f\""
+ properties_j: "xcode_build_version:\"17a5305k\""
}
priority: 30
execution_timeout_secs: 7200
caches {
- name: "xcode_ios_17a5305f"
- path: "xcode_ios_17a5305f.app"
+ name: "xcode_ios_17a5305k"
+ path: "xcode_ios_17a5305k.app"
}
build_numbers: YES
service_account: "webrtc-try-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -2220,13 +2220,13 @@ buckets {
properties_j: "$build/siso:{\"configs\":[\"builder\"],\"enable_cloud_profiler\":true,\"enable_cloud_trace\":true,\"enable_monitoring\":true,\"project\":\"rbe-webrtc-untrusted\"}"
properties_j: "$recipe_engine/resultdb/test_presentation:{\"column_keys\":[],\"grouping_keys\":[\"status\",\"v.test_suite\"]}"
properties_j: "builder_group:\"tryserver.webrtc\""
- properties_j: "xcode_build_version:\"17a5305f\""
+ properties_j: "xcode_build_version:\"17a5305k\""
}
priority: 30
execution_timeout_secs: 7200
caches {
- name: "xcode_ios_17a5305f"
- path: "xcode_ios_17a5305f.app"
+ name: "xcode_ios_17a5305k"
+ path: "xcode_ios_17a5305k.app"
}
build_numbers: YES
service_account: "webrtc-try-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -2255,13 +2255,13 @@ buckets {
properties_j: "$build/siso:{\"configs\":[\"builder\"],\"enable_cloud_profiler\":true,\"enable_cloud_trace\":true,\"enable_monitoring\":true,\"project\":\"rbe-webrtc-untrusted\"}"
properties_j: "$recipe_engine/resultdb/test_presentation:{\"column_keys\":[],\"grouping_keys\":[\"status\",\"v.test_suite\"]}"
properties_j: "builder_group:\"tryserver.webrtc\""
- properties_j: "xcode_build_version:\"17a5305f\""
+ properties_j: "xcode_build_version:\"17a5305k\""
}
priority: 30
execution_timeout_secs: 7200
caches {
- name: "xcode_ios_17a5305f"
- path: "xcode_ios_17a5305f.app"
+ name: "xcode_ios_17a5305k"
+ path: "xcode_ios_17a5305k.app"
}
build_numbers: YES
service_account: "webrtc-try-builder@chops-service-accounts.iam.gserviceaccount.com"
diff --git a/third_party/libwebrtc/infra/specs/client.webrtc.json b/third_party/libwebrtc/infra/specs/client.webrtc.json
@@ -8484,17 +8484,17 @@
}
],
"dimensions": {
- "cpu": "x86-64",
+ "cpu": "arm64",
"os": "Mac-15"
},
"named_caches": [
{
- "name": "xcode_ios_17a5305f",
- "path": "Xcode.app"
- },
- {
"name": "runtime_ios_17_5",
"path": "Runtime-ios-17.5"
+ },
+ {
+ "name": "xcode_ios_17a5305f",
+ "path": "Xcode.app"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -8533,17 +8533,17 @@
}
],
"dimensions": {
- "cpu": "x86-64",
+ "cpu": "arm64",
"os": "Mac-15"
},
"named_caches": [
{
- "name": "xcode_ios_17a5305f",
- "path": "Xcode.app"
- },
- {
"name": "runtime_ios_18_2",
"path": "Runtime-ios-18.2"
+ },
+ {
+ "name": "xcode_ios_17a5305f",
+ "path": "Xcode.app"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -8581,17 +8581,17 @@
}
],
"dimensions": {
- "cpu": "x86-64",
+ "cpu": "arm64",
"os": "Mac-15"
},
"named_caches": [
{
- "name": "xcode_ios_17a5305f",
- "path": "Xcode.app"
- },
- {
"name": "runtime_ios_17_5",
"path": "Runtime-ios-17.5"
+ },
+ {
+ "name": "xcode_ios_17a5305f",
+ "path": "Xcode.app"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -8629,17 +8629,17 @@
}
],
"dimensions": {
- "cpu": "x86-64",
+ "cpu": "arm64",
"os": "Mac-15"
},
"named_caches": [
{
- "name": "xcode_ios_17a5305f",
- "path": "Xcode.app"
- },
- {
"name": "runtime_ios_18_2",
"path": "Runtime-ios-18.2"
+ },
+ {
+ "name": "xcode_ios_17a5305f",
+ "path": "Xcode.app"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -8677,17 +8677,17 @@
}
],
"dimensions": {
- "cpu": "x86-64",
+ "cpu": "arm64",
"os": "Mac-15"
},
"named_caches": [
{
- "name": "xcode_ios_17a5305f",
- "path": "Xcode.app"
- },
- {
"name": "runtime_ios_17_5",
"path": "Runtime-ios-17.5"
+ },
+ {
+ "name": "xcode_ios_17a5305f",
+ "path": "Xcode.app"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -8725,17 +8725,17 @@
}
],
"dimensions": {
- "cpu": "x86-64",
+ "cpu": "arm64",
"os": "Mac-15"
},
"named_caches": [
{
- "name": "xcode_ios_17a5305f",
- "path": "Xcode.app"
- },
- {
"name": "runtime_ios_18_2",
"path": "Runtime-ios-18.2"
+ },
+ {
+ "name": "xcode_ios_17a5305f",
+ "path": "Xcode.app"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -8773,17 +8773,17 @@
}
],
"dimensions": {
- "cpu": "x86-64",
+ "cpu": "arm64",
"os": "Mac-15"
},
"named_caches": [
{
- "name": "xcode_ios_17a5305f",
- "path": "Xcode.app"
- },
- {
"name": "runtime_ios_17_5",
"path": "Runtime-ios-17.5"
+ },
+ {
+ "name": "xcode_ios_17a5305f",
+ "path": "Xcode.app"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -8821,17 +8821,17 @@
}
],
"dimensions": {
- "cpu": "x86-64",
+ "cpu": "arm64",
"os": "Mac-15"
},
"named_caches": [
{
- "name": "xcode_ios_17a5305f",
- "path": "Xcode.app"
- },
- {
"name": "runtime_ios_18_2",
"path": "Runtime-ios-18.2"
+ },
+ {
+ "name": "xcode_ios_17a5305f",
+ "path": "Xcode.app"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -8869,17 +8869,17 @@
}
],
"dimensions": {
- "cpu": "x86-64",
+ "cpu": "arm64",
"os": "Mac-15"
},
"named_caches": [
{
- "name": "xcode_ios_17a5305f",
- "path": "Xcode.app"
- },
- {
"name": "runtime_ios_17_5",
"path": "Runtime-ios-17.5"
+ },
+ {
+ "name": "xcode_ios_17a5305f",
+ "path": "Xcode.app"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -8917,17 +8917,17 @@
}
],
"dimensions": {
- "cpu": "x86-64",
+ "cpu": "arm64",
"os": "Mac-15"
},
"named_caches": [
{
- "name": "xcode_ios_17a5305f",
- "path": "Xcode.app"
- },
- {
"name": "runtime_ios_18_2",
"path": "Runtime-ios-18.2"
+ },
+ {
+ "name": "xcode_ios_17a5305f",
+ "path": "Xcode.app"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -8965,17 +8965,17 @@
}
],
"dimensions": {
- "cpu": "x86-64",
+ "cpu": "arm64",
"os": "Mac-15"
},
"named_caches": [
{
- "name": "xcode_ios_17a5305f",
- "path": "Xcode.app"
- },
- {
"name": "runtime_ios_17_5",
"path": "Runtime-ios-17.5"
+ },
+ {
+ "name": "xcode_ios_17a5305f",
+ "path": "Xcode.app"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
@@ -9014,17 +9014,17 @@
}
],
"dimensions": {
- "cpu": "x86-64",
+ "cpu": "arm64",
"os": "Mac-15"
},
"named_caches": [
{
- "name": "xcode_ios_17a5305f",
- "path": "Xcode.app"
- },
- {
"name": "runtime_ios_18_2",
"path": "Runtime-ios-18.2"
+ },
+ {
+ "name": "xcode_ios_17a5305f",
+ "path": "Xcode.app"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
@@ -9064,17 +9064,17 @@
],
"dimensions": {
"cores": "12",
- "cpu": "x86-64",
+ "cpu": "arm64",
"os": "Mac-15"
},
"named_caches": [
{
- "name": "xcode_ios_17a5305f",
- "path": "Xcode.app"
- },
- {
"name": "runtime_ios_17_5",
"path": "Runtime-ios-17.5"
+ },
+ {
+ "name": "xcode_ios_17a5305f",
+ "path": "Xcode.app"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
@@ -9114,17 +9114,17 @@
],
"dimensions": {
"cores": "12",
- "cpu": "x86-64",
+ "cpu": "arm64",
"os": "Mac-15"
},
"named_caches": [
{
- "name": "xcode_ios_17a5305f",
- "path": "Xcode.app"
- },
- {
"name": "runtime_ios_18_2",
"path": "Runtime-ios-18.2"
+ },
+ {
+ "name": "xcode_ios_17a5305f",
+ "path": "Xcode.app"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
@@ -9163,17 +9163,17 @@
}
],
"dimensions": {
- "cpu": "x86-64",
+ "cpu": "arm64",
"os": "Mac-15"
},
"named_caches": [
{
- "name": "xcode_ios_17a5305f",
- "path": "Xcode.app"
- },
- {
"name": "runtime_ios_17_5",
"path": "Runtime-ios-17.5"
+ },
+ {
+ "name": "xcode_ios_17a5305f",
+ "path": "Xcode.app"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -9211,17 +9211,17 @@
}
],
"dimensions": {
- "cpu": "x86-64",
+ "cpu": "arm64",
"os": "Mac-15"
},
"named_caches": [
{
- "name": "xcode_ios_17a5305f",
- "path": "Xcode.app"
- },
- {
"name": "runtime_ios_18_2",
"path": "Runtime-ios-18.2"
+ },
+ {
+ "name": "xcode_ios_17a5305f",
+ "path": "Xcode.app"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -9259,17 +9259,17 @@
}
],
"dimensions": {
- "cpu": "x86-64",
+ "cpu": "arm64",
"os": "Mac-15"
},
"named_caches": [
{
- "name": "xcode_ios_17a5305f",
- "path": "Xcode.app"
- },
- {
"name": "runtime_ios_17_5",
"path": "Runtime-ios-17.5"
+ },
+ {
+ "name": "xcode_ios_17a5305f",
+ "path": "Xcode.app"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -9307,17 +9307,17 @@
}
],
"dimensions": {
- "cpu": "x86-64",
+ "cpu": "arm64",
"os": "Mac-15"
},
"named_caches": [
{
- "name": "xcode_ios_17a5305f",
- "path": "Xcode.app"
- },
- {
"name": "runtime_ios_18_2",
"path": "Runtime-ios-18.2"
+ },
+ {
+ "name": "xcode_ios_17a5305f",
+ "path": "Xcode.app"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -9355,17 +9355,17 @@
}
],
"dimensions": {
- "cpu": "x86-64",
+ "cpu": "arm64",
"os": "Mac-15"
},
"named_caches": [
{
- "name": "xcode_ios_17a5305f",
- "path": "Xcode.app"
- },
- {
"name": "runtime_ios_17_5",
"path": "Runtime-ios-17.5"
+ },
+ {
+ "name": "xcode_ios_17a5305f",
+ "path": "Xcode.app"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -9403,17 +9403,17 @@
}
],
"dimensions": {
- "cpu": "x86-64",
+ "cpu": "arm64",
"os": "Mac-15"
},
"named_caches": [
{
- "name": "xcode_ios_17a5305f",
- "path": "Xcode.app"
- },
- {
"name": "runtime_ios_18_2",
"path": "Runtime-ios-18.2"
+ },
+ {
+ "name": "xcode_ios_17a5305f",
+ "path": "Xcode.app"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -9451,17 +9451,17 @@
}
],
"dimensions": {
- "cpu": "x86-64",
+ "cpu": "arm64",
"os": "Mac-15"
},
"named_caches": [
{
- "name": "xcode_ios_17a5305f",
- "path": "Xcode.app"
- },
- {
"name": "runtime_ios_17_5",
"path": "Runtime-ios-17.5"
+ },
+ {
+ "name": "xcode_ios_17a5305f",
+ "path": "Xcode.app"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -9499,17 +9499,17 @@
}
],
"dimensions": {
- "cpu": "x86-64",
+ "cpu": "arm64",
"os": "Mac-15"
},
"named_caches": [
{
- "name": "xcode_ios_17a5305f",
- "path": "Xcode.app"
- },
- {
"name": "runtime_ios_18_2",
"path": "Runtime-ios-18.2"
+ },
+ {
+ "name": "xcode_ios_17a5305f",
+ "path": "Xcode.app"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -9548,17 +9548,17 @@
}
],
"dimensions": {
- "cpu": "x86-64",
+ "cpu": "arm64",
"os": "Mac-15"
},
"named_caches": [
{
- "name": "xcode_ios_17a5305f",
- "path": "Xcode.app"
- },
- {
"name": "runtime_ios_17_5",
"path": "Runtime-ios-17.5"
+ },
+ {
+ "name": "xcode_ios_17a5305f",
+ "path": "Xcode.app"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -9597,17 +9597,17 @@
}
],
"dimensions": {
- "cpu": "x86-64",
+ "cpu": "arm64",
"os": "Mac-15"
},
"named_caches": [
{
- "name": "xcode_ios_17a5305f",
- "path": "Xcode.app"
- },
- {
"name": "runtime_ios_18_2",
"path": "Runtime-ios-18.2"
+ },
+ {
+ "name": "xcode_ios_17a5305f",
+ "path": "Xcode.app"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -9646,17 +9646,17 @@
}
],
"dimensions": {
- "cpu": "x86-64",
+ "cpu": "arm64",
"os": "Mac-15"
},
"named_caches": [
{
- "name": "xcode_ios_17a5305f",
- "path": "Xcode.app"
- },
- {
"name": "runtime_ios_17_5",
"path": "Runtime-ios-17.5"
+ },
+ {
+ "name": "xcode_ios_17a5305f",
+ "path": "Xcode.app"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -9695,17 +9695,17 @@
}
],
"dimensions": {
- "cpu": "x86-64",
+ "cpu": "arm64",
"os": "Mac-15"
},
"named_caches": [
{
- "name": "xcode_ios_17a5305f",
- "path": "Xcode.app"
- },
- {
"name": "runtime_ios_18_2",
"path": "Runtime-ios-18.2"
+ },
+ {
+ "name": "xcode_ios_17a5305f",
+ "path": "Xcode.app"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -9744,17 +9744,17 @@
],
"dimensions": {
"cores": "12",
- "cpu": "x86-64",
+ "cpu": "arm64",
"os": "Mac-15"
},
"named_caches": [
{
- "name": "xcode_ios_17a5305f",
- "path": "Xcode.app"
- },
- {
"name": "runtime_ios_17_5",
"path": "Runtime-ios-17.5"
+ },
+ {
+ "name": "xcode_ios_17a5305f",
+ "path": "Xcode.app"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
@@ -9794,17 +9794,17 @@
],
"dimensions": {
"cores": "12",
- "cpu": "x86-64",
+ "cpu": "arm64",
"os": "Mac-15"
},
"named_caches": [
{
- "name": "xcode_ios_17a5305f",
- "path": "Xcode.app"
- },
- {
"name": "runtime_ios_18_2",
"path": "Runtime-ios-18.2"
+ },
+ {
+ "name": "xcode_ios_17a5305f",
+ "path": "Xcode.app"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
@@ -9843,17 +9843,17 @@
}
],
"dimensions": {
- "cpu": "x86-64",
+ "cpu": "arm64",
"os": "Mac-15"
},
"named_caches": [
{
- "name": "xcode_ios_17a5305f",
- "path": "Xcode.app"
- },
- {
"name": "runtime_ios_17_5",
"path": "Runtime-ios-17.5"
+ },
+ {
+ "name": "xcode_ios_17a5305f",
+ "path": "Xcode.app"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -9891,17 +9891,17 @@
}
],
"dimensions": {
- "cpu": "x86-64",
+ "cpu": "arm64",
"os": "Mac-15"
},
"named_caches": [
{
- "name": "xcode_ios_17a5305f",
- "path": "Xcode.app"
- },
- {
"name": "runtime_ios_18_2",
"path": "Runtime-ios-18.2"
+ },
+ {
+ "name": "xcode_ios_17a5305f",
+ "path": "Xcode.app"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -9939,17 +9939,17 @@
}
],
"dimensions": {
- "cpu": "x86-64",
+ "cpu": "arm64",
"os": "Mac-15"
},
"named_caches": [
{
- "name": "xcode_ios_17a5305f",
- "path": "Xcode.app"
- },
- {
"name": "runtime_ios_17_5",
"path": "Runtime-ios-17.5"
+ },
+ {
+ "name": "xcode_ios_17a5305f",
+ "path": "Xcode.app"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -9987,17 +9987,17 @@
}
],
"dimensions": {
- "cpu": "x86-64",
+ "cpu": "arm64",
"os": "Mac-15"
},
"named_caches": [
{
- "name": "xcode_ios_17a5305f",
- "path": "Xcode.app"
- },
- {
"name": "runtime_ios_18_2",
"path": "Runtime-ios-18.2"
+ },
+ {
+ "name": "xcode_ios_17a5305f",
+ "path": "Xcode.app"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -10035,17 +10035,17 @@
}
],
"dimensions": {
- "cpu": "x86-64",
+ "cpu": "arm64",
"os": "Mac-15"
},
"named_caches": [
{
- "name": "xcode_ios_17a5305f",
- "path": "Xcode.app"
- },
- {
"name": "runtime_ios_17_5",
"path": "Runtime-ios-17.5"
+ },
+ {
+ "name": "xcode_ios_17a5305f",
+ "path": "Xcode.app"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -10083,17 +10083,17 @@
}
],
"dimensions": {
- "cpu": "x86-64",
+ "cpu": "arm64",
"os": "Mac-15"
},
"named_caches": [
{
- "name": "xcode_ios_17a5305f",
- "path": "Xcode.app"
- },
- {
"name": "runtime_ios_18_2",
"path": "Runtime-ios-18.2"
+ },
+ {
+ "name": "xcode_ios_17a5305f",
+ "path": "Xcode.app"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -10131,17 +10131,17 @@
}
],
"dimensions": {
- "cpu": "x86-64",
+ "cpu": "arm64",
"os": "Mac-15"
},
"named_caches": [
{
- "name": "xcode_ios_17a5305f",
- "path": "Xcode.app"
- },
- {
"name": "runtime_ios_17_5",
"path": "Runtime-ios-17.5"
+ },
+ {
+ "name": "xcode_ios_17a5305f",
+ "path": "Xcode.app"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
@@ -10180,17 +10180,17 @@
}
],
"dimensions": {
- "cpu": "x86-64",
+ "cpu": "arm64",
"os": "Mac-15"
},
"named_caches": [
{
- "name": "xcode_ios_17a5305f",
- "path": "Xcode.app"
- },
- {
"name": "runtime_ios_18_2",
"path": "Runtime-ios-18.2"
+ },
+ {
+ "name": "xcode_ios_17a5305f",
+ "path": "Xcode.app"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
@@ -10229,17 +10229,17 @@
}
],
"dimensions": {
- "cpu": "x86-64",
+ "cpu": "arm64",
"os": "Mac-15"
},
"named_caches": [
{
- "name": "xcode_ios_17a5305f",
- "path": "Xcode.app"
- },
- {
"name": "runtime_ios_17_5",
"path": "Runtime-ios-17.5"
+ },
+ {
+ "name": "xcode_ios_17a5305f",
+ "path": "Xcode.app"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -10277,17 +10277,17 @@
}
],
"dimensions": {
- "cpu": "x86-64",
+ "cpu": "arm64",
"os": "Mac-15"
},
"named_caches": [
{
- "name": "xcode_ios_17a5305f",
- "path": "Xcode.app"
- },
- {
"name": "runtime_ios_18_2",
"path": "Runtime-ios-18.2"
+ },
+ {
+ "name": "xcode_ios_17a5305f",
+ "path": "Xcode.app"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -10325,17 +10325,17 @@
}
],
"dimensions": {
- "cpu": "x86-64",
+ "cpu": "arm64",
"os": "Mac-15"
},
"named_caches": [
{
- "name": "xcode_ios_17a5305f",
- "path": "Xcode.app"
- },
- {
"name": "runtime_ios_17_5",
"path": "Runtime-ios-17.5"
+ },
+ {
+ "name": "xcode_ios_17a5305f",
+ "path": "Xcode.app"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -10373,17 +10373,17 @@
}
],
"dimensions": {
- "cpu": "x86-64",
+ "cpu": "arm64",
"os": "Mac-15"
},
"named_caches": [
{
- "name": "xcode_ios_17a5305f",
- "path": "Xcode.app"
- },
- {
"name": "runtime_ios_18_2",
"path": "Runtime-ios-18.2"
+ },
+ {
+ "name": "xcode_ios_17a5305f",
+ "path": "Xcode.app"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
diff --git a/third_party/libwebrtc/infra/specs/mixins.pyl b/third_party/libwebrtc/infra/specs/mixins.pyl
@@ -299,7 +299,7 @@
}
}
},
- 'xcode_17_main': {
+ 'xcode_26_main': {
'args': ['--xcode-build-version', '17a5305f'],
'swarming': {
'named_caches': [{
diff --git a/third_party/libwebrtc/infra/specs/mixins_webrtc.pyl b/third_party/libwebrtc/infra/specs/mixins_webrtc.pyl
@@ -251,20 +251,6 @@
'--xctest',
],
},
- 'xcode_17_main': {
- 'args': [
- '--xcode-build-version',
- '17a5305f',
- ],
- 'swarming': {
- 'named_caches': [
- {
- 'name': 'xcode_ios_17a5305f',
- 'path': 'Xcode.app',
- },
- ],
- },
- },
'xcodebuild_sim_runner': {
'args': ['--xcodebuild-sim-runner']
}
diff --git a/third_party/libwebrtc/infra/specs/tryserver.webrtc.json b/third_party/libwebrtc/infra/specs/tryserver.webrtc.json
@@ -2538,17 +2538,17 @@
}
],
"dimensions": {
- "cpu": "x86-64",
+ "cpu": "arm64",
"os": "Mac-15"
},
"named_caches": [
{
- "name": "xcode_ios_17a5305f",
- "path": "Xcode.app"
- },
- {
"name": "runtime_ios_17_5",
"path": "Runtime-ios-17.5"
+ },
+ {
+ "name": "xcode_ios_17a5305f",
+ "path": "Xcode.app"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -2587,17 +2587,17 @@
}
],
"dimensions": {
- "cpu": "x86-64",
+ "cpu": "arm64",
"os": "Mac-15"
},
"named_caches": [
{
- "name": "xcode_ios_17a5305f",
- "path": "Xcode.app"
- },
- {
"name": "runtime_ios_18_2",
"path": "Runtime-ios-18.2"
+ },
+ {
+ "name": "xcode_ios_17a5305f",
+ "path": "Xcode.app"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -2635,17 +2635,17 @@
}
],
"dimensions": {
- "cpu": "x86-64",
+ "cpu": "arm64",
"os": "Mac-15"
},
"named_caches": [
{
- "name": "xcode_ios_17a5305f",
- "path": "Xcode.app"
- },
- {
"name": "runtime_ios_17_5",
"path": "Runtime-ios-17.5"
+ },
+ {
+ "name": "xcode_ios_17a5305f",
+ "path": "Xcode.app"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -2683,17 +2683,17 @@
}
],
"dimensions": {
- "cpu": "x86-64",
+ "cpu": "arm64",
"os": "Mac-15"
},
"named_caches": [
{
- "name": "xcode_ios_17a5305f",
- "path": "Xcode.app"
- },
- {
"name": "runtime_ios_18_2",
"path": "Runtime-ios-18.2"
+ },
+ {
+ "name": "xcode_ios_17a5305f",
+ "path": "Xcode.app"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -2731,17 +2731,17 @@
}
],
"dimensions": {
- "cpu": "x86-64",
+ "cpu": "arm64",
"os": "Mac-15"
},
"named_caches": [
{
- "name": "xcode_ios_17a5305f",
- "path": "Xcode.app"
- },
- {
"name": "runtime_ios_17_5",
"path": "Runtime-ios-17.5"
+ },
+ {
+ "name": "xcode_ios_17a5305f",
+ "path": "Xcode.app"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -2779,17 +2779,17 @@
}
],
"dimensions": {
- "cpu": "x86-64",
+ "cpu": "arm64",
"os": "Mac-15"
},
"named_caches": [
{
- "name": "xcode_ios_17a5305f",
- "path": "Xcode.app"
- },
- {
"name": "runtime_ios_18_2",
"path": "Runtime-ios-18.2"
+ },
+ {
+ "name": "xcode_ios_17a5305f",
+ "path": "Xcode.app"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -2827,17 +2827,17 @@
}
],
"dimensions": {
- "cpu": "x86-64",
+ "cpu": "arm64",
"os": "Mac-15"
},
"named_caches": [
{
- "name": "xcode_ios_17a5305f",
- "path": "Xcode.app"
- },
- {
"name": "runtime_ios_17_5",
"path": "Runtime-ios-17.5"
+ },
+ {
+ "name": "xcode_ios_17a5305f",
+ "path": "Xcode.app"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -2875,17 +2875,17 @@
}
],
"dimensions": {
- "cpu": "x86-64",
+ "cpu": "arm64",
"os": "Mac-15"
},
"named_caches": [
{
- "name": "xcode_ios_17a5305f",
- "path": "Xcode.app"
- },
- {
"name": "runtime_ios_18_2",
"path": "Runtime-ios-18.2"
+ },
+ {
+ "name": "xcode_ios_17a5305f",
+ "path": "Xcode.app"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -2923,17 +2923,17 @@
}
],
"dimensions": {
- "cpu": "x86-64",
+ "cpu": "arm64",
"os": "Mac-15"
},
"named_caches": [
{
- "name": "xcode_ios_17a5305f",
- "path": "Xcode.app"
- },
- {
"name": "runtime_ios_17_5",
"path": "Runtime-ios-17.5"
+ },
+ {
+ "name": "xcode_ios_17a5305f",
+ "path": "Xcode.app"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -2971,17 +2971,17 @@
}
],
"dimensions": {
- "cpu": "x86-64",
+ "cpu": "arm64",
"os": "Mac-15"
},
"named_caches": [
{
- "name": "xcode_ios_17a5305f",
- "path": "Xcode.app"
- },
- {
"name": "runtime_ios_18_2",
"path": "Runtime-ios-18.2"
+ },
+ {
+ "name": "xcode_ios_17a5305f",
+ "path": "Xcode.app"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -3019,17 +3019,17 @@
}
],
"dimensions": {
- "cpu": "x86-64",
+ "cpu": "arm64",
"os": "Mac-15"
},
"named_caches": [
{
- "name": "xcode_ios_17a5305f",
- "path": "Xcode.app"
- },
- {
"name": "runtime_ios_17_5",
"path": "Runtime-ios-17.5"
+ },
+ {
+ "name": "xcode_ios_17a5305f",
+ "path": "Xcode.app"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
@@ -3068,17 +3068,17 @@
}
],
"dimensions": {
- "cpu": "x86-64",
+ "cpu": "arm64",
"os": "Mac-15"
},
"named_caches": [
{
- "name": "xcode_ios_17a5305f",
- "path": "Xcode.app"
- },
- {
"name": "runtime_ios_18_2",
"path": "Runtime-ios-18.2"
+ },
+ {
+ "name": "xcode_ios_17a5305f",
+ "path": "Xcode.app"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
@@ -3118,17 +3118,17 @@
],
"dimensions": {
"cores": "12",
- "cpu": "x86-64",
+ "cpu": "arm64",
"os": "Mac-15"
},
"named_caches": [
{
- "name": "xcode_ios_17a5305f",
- "path": "Xcode.app"
- },
- {
"name": "runtime_ios_17_5",
"path": "Runtime-ios-17.5"
+ },
+ {
+ "name": "xcode_ios_17a5305f",
+ "path": "Xcode.app"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
@@ -3168,17 +3168,17 @@
],
"dimensions": {
"cores": "12",
- "cpu": "x86-64",
+ "cpu": "arm64",
"os": "Mac-15"
},
"named_caches": [
{
- "name": "xcode_ios_17a5305f",
- "path": "Xcode.app"
- },
- {
"name": "runtime_ios_18_2",
"path": "Runtime-ios-18.2"
+ },
+ {
+ "name": "xcode_ios_17a5305f",
+ "path": "Xcode.app"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
@@ -3217,17 +3217,17 @@
}
],
"dimensions": {
- "cpu": "x86-64",
+ "cpu": "arm64",
"os": "Mac-15"
},
"named_caches": [
{
- "name": "xcode_ios_17a5305f",
- "path": "Xcode.app"
- },
- {
"name": "runtime_ios_17_5",
"path": "Runtime-ios-17.5"
+ },
+ {
+ "name": "xcode_ios_17a5305f",
+ "path": "Xcode.app"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -3265,17 +3265,17 @@
}
],
"dimensions": {
- "cpu": "x86-64",
+ "cpu": "arm64",
"os": "Mac-15"
},
"named_caches": [
{
- "name": "xcode_ios_17a5305f",
- "path": "Xcode.app"
- },
- {
"name": "runtime_ios_18_2",
"path": "Runtime-ios-18.2"
+ },
+ {
+ "name": "xcode_ios_17a5305f",
+ "path": "Xcode.app"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -3313,17 +3313,17 @@
}
],
"dimensions": {
- "cpu": "x86-64",
+ "cpu": "arm64",
"os": "Mac-15"
},
"named_caches": [
{
- "name": "xcode_ios_17a5305f",
- "path": "Xcode.app"
- },
- {
"name": "runtime_ios_17_5",
"path": "Runtime-ios-17.5"
+ },
+ {
+ "name": "xcode_ios_17a5305f",
+ "path": "Xcode.app"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -3361,17 +3361,17 @@
}
],
"dimensions": {
- "cpu": "x86-64",
+ "cpu": "arm64",
"os": "Mac-15"
},
"named_caches": [
{
- "name": "xcode_ios_17a5305f",
- "path": "Xcode.app"
- },
- {
"name": "runtime_ios_18_2",
"path": "Runtime-ios-18.2"
+ },
+ {
+ "name": "xcode_ios_17a5305f",
+ "path": "Xcode.app"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -3409,17 +3409,17 @@
}
],
"dimensions": {
- "cpu": "x86-64",
+ "cpu": "arm64",
"os": "Mac-15"
},
"named_caches": [
{
- "name": "xcode_ios_17a5305f",
- "path": "Xcode.app"
- },
- {
"name": "runtime_ios_17_5",
"path": "Runtime-ios-17.5"
+ },
+ {
+ "name": "xcode_ios_17a5305f",
+ "path": "Xcode.app"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -3457,17 +3457,17 @@
}
],
"dimensions": {
- "cpu": "x86-64",
+ "cpu": "arm64",
"os": "Mac-15"
},
"named_caches": [
{
- "name": "xcode_ios_17a5305f",
- "path": "Xcode.app"
- },
- {
"name": "runtime_ios_18_2",
"path": "Runtime-ios-18.2"
+ },
+ {
+ "name": "xcode_ios_17a5305f",
+ "path": "Xcode.app"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -3505,17 +3505,17 @@
}
],
"dimensions": {
- "cpu": "x86-64",
+ "cpu": "arm64",
"os": "Mac-15"
},
"named_caches": [
{
- "name": "xcode_ios_17a5305f",
- "path": "Xcode.app"
- },
- {
"name": "runtime_ios_17_5",
"path": "Runtime-ios-17.5"
+ },
+ {
+ "name": "xcode_ios_17a5305f",
+ "path": "Xcode.app"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -3553,17 +3553,17 @@
}
],
"dimensions": {
- "cpu": "x86-64",
+ "cpu": "arm64",
"os": "Mac-15"
},
"named_caches": [
{
- "name": "xcode_ios_17a5305f",
- "path": "Xcode.app"
- },
- {
"name": "runtime_ios_18_2",
"path": "Runtime-ios-18.2"
+ },
+ {
+ "name": "xcode_ios_17a5305f",
+ "path": "Xcode.app"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -3602,17 +3602,17 @@
}
],
"dimensions": {
- "cpu": "x86-64",
+ "cpu": "arm64",
"os": "Mac-15"
},
"named_caches": [
{
- "name": "xcode_ios_17a5305f",
- "path": "Xcode.app"
- },
- {
"name": "runtime_ios_17_5",
"path": "Runtime-ios-17.5"
+ },
+ {
+ "name": "xcode_ios_17a5305f",
+ "path": "Xcode.app"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -3651,17 +3651,17 @@
}
],
"dimensions": {
- "cpu": "x86-64",
+ "cpu": "arm64",
"os": "Mac-15"
},
"named_caches": [
{
- "name": "xcode_ios_17a5305f",
- "path": "Xcode.app"
- },
- {
"name": "runtime_ios_18_2",
"path": "Runtime-ios-18.2"
+ },
+ {
+ "name": "xcode_ios_17a5305f",
+ "path": "Xcode.app"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -3700,17 +3700,17 @@
}
],
"dimensions": {
- "cpu": "x86-64",
+ "cpu": "arm64",
"os": "Mac-15"
},
"named_caches": [
{
- "name": "xcode_ios_17a5305f",
- "path": "Xcode.app"
- },
- {
"name": "runtime_ios_17_5",
"path": "Runtime-ios-17.5"
+ },
+ {
+ "name": "xcode_ios_17a5305f",
+ "path": "Xcode.app"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -3749,17 +3749,17 @@
}
],
"dimensions": {
- "cpu": "x86-64",
+ "cpu": "arm64",
"os": "Mac-15"
},
"named_caches": [
{
- "name": "xcode_ios_17a5305f",
- "path": "Xcode.app"
- },
- {
"name": "runtime_ios_18_2",
"path": "Runtime-ios-18.2"
+ },
+ {
+ "name": "xcode_ios_17a5305f",
+ "path": "Xcode.app"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -3798,17 +3798,17 @@
],
"dimensions": {
"cores": "12",
- "cpu": "x86-64",
+ "cpu": "arm64",
"os": "Mac-15"
},
"named_caches": [
{
- "name": "xcode_ios_17a5305f",
- "path": "Xcode.app"
- },
- {
"name": "runtime_ios_17_5",
"path": "Runtime-ios-17.5"
+ },
+ {
+ "name": "xcode_ios_17a5305f",
+ "path": "Xcode.app"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
@@ -3848,17 +3848,17 @@
],
"dimensions": {
"cores": "12",
- "cpu": "x86-64",
+ "cpu": "arm64",
"os": "Mac-15"
},
"named_caches": [
{
- "name": "xcode_ios_17a5305f",
- "path": "Xcode.app"
- },
- {
"name": "runtime_ios_18_2",
"path": "Runtime-ios-18.2"
+ },
+ {
+ "name": "xcode_ios_17a5305f",
+ "path": "Xcode.app"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
@@ -3897,17 +3897,17 @@
}
],
"dimensions": {
- "cpu": "x86-64",
+ "cpu": "arm64",
"os": "Mac-15"
},
"named_caches": [
{
- "name": "xcode_ios_17a5305f",
- "path": "Xcode.app"
- },
- {
"name": "runtime_ios_17_5",
"path": "Runtime-ios-17.5"
+ },
+ {
+ "name": "xcode_ios_17a5305f",
+ "path": "Xcode.app"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -3945,17 +3945,17 @@
}
],
"dimensions": {
- "cpu": "x86-64",
+ "cpu": "arm64",
"os": "Mac-15"
},
"named_caches": [
{
- "name": "xcode_ios_17a5305f",
- "path": "Xcode.app"
- },
- {
"name": "runtime_ios_18_2",
"path": "Runtime-ios-18.2"
+ },
+ {
+ "name": "xcode_ios_17a5305f",
+ "path": "Xcode.app"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -3993,17 +3993,17 @@
}
],
"dimensions": {
- "cpu": "x86-64",
+ "cpu": "arm64",
"os": "Mac-15"
},
"named_caches": [
{
- "name": "xcode_ios_17a5305f",
- "path": "Xcode.app"
- },
- {
"name": "runtime_ios_17_5",
"path": "Runtime-ios-17.5"
+ },
+ {
+ "name": "xcode_ios_17a5305f",
+ "path": "Xcode.app"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -4041,17 +4041,17 @@
}
],
"dimensions": {
- "cpu": "x86-64",
+ "cpu": "arm64",
"os": "Mac-15"
},
"named_caches": [
{
- "name": "xcode_ios_17a5305f",
- "path": "Xcode.app"
- },
- {
"name": "runtime_ios_18_2",
"path": "Runtime-ios-18.2"
+ },
+ {
+ "name": "xcode_ios_17a5305f",
+ "path": "Xcode.app"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -4089,17 +4089,17 @@
}
],
"dimensions": {
- "cpu": "x86-64",
+ "cpu": "arm64",
"os": "Mac-15"
},
"named_caches": [
{
- "name": "xcode_ios_17a5305f",
- "path": "Xcode.app"
- },
- {
"name": "runtime_ios_17_5",
"path": "Runtime-ios-17.5"
+ },
+ {
+ "name": "xcode_ios_17a5305f",
+ "path": "Xcode.app"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -4137,17 +4137,17 @@
}
],
"dimensions": {
- "cpu": "x86-64",
+ "cpu": "arm64",
"os": "Mac-15"
},
"named_caches": [
{
- "name": "xcode_ios_17a5305f",
- "path": "Xcode.app"
- },
- {
"name": "runtime_ios_18_2",
"path": "Runtime-ios-18.2"
+ },
+ {
+ "name": "xcode_ios_17a5305f",
+ "path": "Xcode.app"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -4185,17 +4185,17 @@
}
],
"dimensions": {
- "cpu": "x86-64",
+ "cpu": "arm64",
"os": "Mac-15"
},
"named_caches": [
{
- "name": "xcode_ios_17a5305f",
- "path": "Xcode.app"
- },
- {
"name": "runtime_ios_17_5",
"path": "Runtime-ios-17.5"
+ },
+ {
+ "name": "xcode_ios_17a5305f",
+ "path": "Xcode.app"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
@@ -4234,17 +4234,17 @@
}
],
"dimensions": {
- "cpu": "x86-64",
+ "cpu": "arm64",
"os": "Mac-15"
},
"named_caches": [
{
- "name": "xcode_ios_17a5305f",
- "path": "Xcode.app"
- },
- {
"name": "runtime_ios_18_2",
"path": "Runtime-ios-18.2"
+ },
+ {
+ "name": "xcode_ios_17a5305f",
+ "path": "Xcode.app"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
@@ -4283,17 +4283,17 @@
}
],
"dimensions": {
- "cpu": "x86-64",
+ "cpu": "arm64",
"os": "Mac-15"
},
"named_caches": [
{
- "name": "xcode_ios_17a5305f",
- "path": "Xcode.app"
- },
- {
"name": "runtime_ios_17_5",
"path": "Runtime-ios-17.5"
+ },
+ {
+ "name": "xcode_ios_17a5305f",
+ "path": "Xcode.app"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -4331,17 +4331,17 @@
}
],
"dimensions": {
- "cpu": "x86-64",
+ "cpu": "arm64",
"os": "Mac-15"
},
"named_caches": [
{
- "name": "xcode_ios_17a5305f",
- "path": "Xcode.app"
- },
- {
"name": "runtime_ios_18_2",
"path": "Runtime-ios-18.2"
+ },
+ {
+ "name": "xcode_ios_17a5305f",
+ "path": "Xcode.app"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -4379,17 +4379,17 @@
}
],
"dimensions": {
- "cpu": "x86-64",
+ "cpu": "arm64",
"os": "Mac-15"
},
"named_caches": [
{
- "name": "xcode_ios_17a5305f",
- "path": "Xcode.app"
- },
- {
"name": "runtime_ios_17_5",
"path": "Runtime-ios-17.5"
+ },
+ {
+ "name": "xcode_ios_17a5305f",
+ "path": "Xcode.app"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
@@ -4427,17 +4427,17 @@
}
],
"dimensions": {
- "cpu": "x86-64",
+ "cpu": "arm64",
"os": "Mac-15"
},
"named_caches": [
{
- "name": "xcode_ios_17a5305f",
- "path": "Xcode.app"
- },
- {
"name": "runtime_ios_18_2",
"path": "Runtime-ios-18.2"
+ },
+ {
+ "name": "xcode_ios_17a5305f",
+ "path": "Xcode.app"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
diff --git a/third_party/libwebrtc/infra/specs/variants.pyl b/third_party/libwebrtc/infra/specs/variants.pyl
@@ -15,7 +15,7 @@
'17.5',
],
'identifier': 'iPhone 14 17.5',
- 'mixins': ['xcode_17_main', 'ios_runtime_cache_17_5'],
+ 'mixins': ['ios_runtime_cache_17_5'],
},
'SIM_IPHONE_15_18_2': {
'args': [
@@ -25,6 +25,6 @@
'18.2',
],
'identifier': 'iPhone 15 18.2',
- 'mixins': ['xcode_17_main', 'ios_runtime_cache_18_2'],
+ 'mixins': ['ios_runtime_cache_18_2'],
},
}
diff --git a/third_party/libwebrtc/infra/specs/waterfalls.pyl b/third_party/libwebrtc/infra/specs/waterfalls.pyl
@@ -228,8 +228,9 @@
},
'iOS Debug (simulator)': {
'mixins': [
- 'mac_15_x64', 'chromium-tester-service-account', 'mac_toolchain',
- 'has_native_resultdb_integration', 'out_dir_arg', 'webrtc-xctest'
+ 'mac_15_arm64', 'xcode_26_main', 'chromium-tester-service-account',
+ 'mac_toolchain', 'has_native_resultdb_integration', 'out_dir_arg',
+ 'webrtc-xctest'
],
'test_suites': {
'isolated_scripts': 'ios_simulator_tests_matrix',
@@ -322,7 +323,7 @@
'iOS64 Debug': {
'mixins': [
'ios-device-18', 'webrtc-xctest', 'chrome-tester-service-account',
- 'xcode_17_main', 'mac_toolchain', 'has_native_resultdb_integration',
+ 'xcode_26_main', 'mac_toolchain', 'has_native_resultdb_integration',
'out_dir_arg'
],
'test_suites': {
@@ -332,7 +333,7 @@
'iOS64 Perf': {
'mixins': [
'arm64', 'ios-device-perf', 'webrtc-xctest', 'timeout-3h',
- 'chrome-tester-service-account', 'xcode_17_main', 'mac_toolchain',
+ 'chrome-tester-service-account', 'xcode_26_main', 'mac_toolchain',
'has_native_resultdb_integration', 'out_dir_arg'
],
'test_suites': {
@@ -345,7 +346,7 @@
'iOS64 Release': {
'mixins': [
'ios-device-18', 'webrtc-xctest', 'chrome-tester-service-account',
- 'xcode_17_main', 'mac_toolchain', 'has_native_resultdb_integration',
+ 'xcode_26_main', 'mac_toolchain', 'has_native_resultdb_integration',
'out_dir_arg'
],
'test_suites': {
@@ -430,8 +431,9 @@
'ios_compile_arm64_rel': {},
'ios_dbg_simulator': {
'mixins': [
- 'mac_15_x64', 'chromium-tester-service-account', 'mac_toolchain',
- 'has_native_resultdb_integration', 'out_dir_arg', 'webrtc-xctest'
+ 'mac_15_arm64', 'xcode_26_main', 'chromium-tester-service-account',
+ 'mac_toolchain', 'has_native_resultdb_integration', 'out_dir_arg',
+ 'webrtc-xctest'
],
'test_suites': {
'isolated_scripts': 'ios_simulator_tests_matrix',
diff --git a/third_party/libwebrtc/tools_webrtc/mb/mb_config.pyl b/third_party/libwebrtc/tools_webrtc/mb/mb_config.pyl
@@ -102,7 +102,7 @@
'Win64 Release (Clang)': 'win_clang_release_bot_x64',
# iOS
- 'iOS Debug (simulator)': 'ios_debug_bot_x64',
+ 'iOS Debug (simulator)': 'ios_debug_bot_arm64',
'iOS64 Debug': 'ios_debug_bot_arm64',
'iOS64 Release': 'ios_release_bot_arm64',
},
@@ -166,7 +166,7 @@
# iOS
'ios_compile_arm64_dbg': 'ios_debug_bot_arm64',
'ios_compile_arm64_rel': 'ios_release_bot_arm64',
- 'ios_dbg_simulator': 'ios_debug_bot_x64',
+ 'ios_dbg_simulator': 'ios_debug_bot_arm64',
# Include What You Use
'iwyu_verifier': 'release_bot_x64',
@@ -347,14 +347,6 @@
'ios_simulator',
'debug_bot',
'arm64',
- 'no_ios_code_signing',
- 'xctest',
- ],
- 'ios_debug_bot_x64': [
- 'ios',
- 'ios_simulator',
- 'debug_bot',
- 'x64',
'xctest',
],
'ios_internal_debug_bot_arm64': [
