From d8bbc7858622b6d9c278469aab701ca0b609cddf Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Wed, 15 May 2024 05:35:49 +0200
Subject: Merging upstream version 126.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 third_party/libwebrtc/infra/specs/mixins.pyl | 61 ++++++++++++----------------
 1 file changed, 25 insertions(+), 36 deletions(-)

(limited to 'third_party/libwebrtc/infra/specs/mixins.pyl')

diff --git a/third_party/libwebrtc/infra/specs/mixins.pyl b/third_party/libwebrtc/infra/specs/mixins.pyl
index e436846ef0..8520002df6 100644
--- a/third_party/libwebrtc/infra/specs/mixins.pyl
+++ b/third_party/libwebrtc/infra/specs/mixins.pyl
@@ -18,20 +18,6 @@
       }
     }
   },
-  'baremetal-pool': {
-    'swarming': {
-      'dimensions': {
-        'pool': 'WebRTC-baremetal'
-      }
-    }
-  },
-  'baremetal-try-pool': {
-    'swarming': {
-      'dimensions': {
-        'pool': 'WebRTC-baremetal-try'
-      }
-    }
-  },
   'chrome-tester-service-account': {
     'swarming': {
       'service_account':
@@ -92,27 +78,27 @@
       }
     }
   },
-  'ios_runtime_cache_14_5': {
+  'ios_runtime_cache_15_5': {
     'swarming': {
       'named_caches': [{
-        'name': 'runtime_ios_14_5',
-        'path': 'Runtime-ios-14.5'
+        'name': 'runtime_ios_15_5',
+        'path': 'Runtime-ios-15.5'
       }]
     }
   },
-  'ios_runtime_cache_15_5': {
+  'ios_runtime_cache_16_4': {
     'swarming': {
       'named_caches': [{
-        'name': 'runtime_ios_15_5',
-        'path': 'Runtime-ios-15.5'
+        'name': 'runtime_ios_16_4',
+        'path': 'Runtime-ios-16.4'
       }]
     }
   },
-  'ios_runtime_cache_16_2': {
+  'ios_runtime_cache_17_0': {
     'swarming': {
       'named_caches': [{
-        'name': 'runtime_ios_16_2',
-        'path': 'Runtime-ios-16.2'
+        'name': 'runtime_ios_17_0',
+        'path': 'Runtime-ios-17.0'
       }]
     }
   },
@@ -168,6 +154,14 @@
       }
     }
   },
+  'mac_13_x64': {
+    'swarming': {
+      'dimensions': {
+        'cpu': 'x86-64',
+        'os': 'Mac-13'
+      }
+    }
+  },
   'mac_toolchain': {
     'swarming': {
       'cipd_packages': [{
@@ -176,7 +170,7 @@
         'location':
         '.',
         'revision':
-        'git_revision:32d81d877ee07af07bf03b7f70ce597e323b80ce'
+        'git_revision:b28cf90d462a7bbd45c28f2d931960c2b9404cb0'
       }]
     }
   },
@@ -299,23 +293,18 @@
       }
     }
   },
-  'x86-64': {
+  'win11': {
     'swarming': {
       'dimensions': {
-        'cpu': 'x86-64'
+        'os': 'Windows-11-22000'
       }
     }
   },
-  'xcode_13_main': {
-    'args': ['--xcode-build-version', '13c100'],
+  'x86-64': {
     'swarming': {
       'dimensions': {
-        'caches': 'xcode_ios_13c100'
-      },
-      'named_caches': [{
-        'name': 'xcode_ios_13c100',
-        'path': 'Xcode.app'
-      }]
+        'cpu': 'x86-64'
+      }
     }
   },
   'xcode_14_main': {
@@ -339,7 +328,7 @@
       }]
     }
   },
-  'xcode_parallelization': {
-    'args': ['--xcode-parallelization']
+  'xcodebuild_sim_runner': {
+    'args': ['--xcodebuild-sim-runner']
   }
 }
-- 
cgit v1.2.3