Commit a8eba3b4 authored by Byron Campen's avatar Byron Campen
Browse files

Bug 1822194 - Vendor libwebrtc from c6ae33fb07

Upstream commit: https://webrtc.googlesource.com/src/+/c6ae33fb079923eb973c70e4291d6ad4c65b552d
    Replace dash by underscore in the command line argument before absl flag parsing.

    The expected behavior is to have something similar than python:
    https://docs.python.org/dev/library/argparse.html#dest:
    "Any internal - characters will be converted to _ characters to make sure the string is a valid attribute name".

    This allows to catch chromium arguments like 'isolated-script-test-output' that previously needed some preprocessing done for example in flags_compatibility.py.

    This CL also fixes a fuchsia specific issue where the test runner needs a 'isolated-script-test-output' argument but then pass the argument to WebRTC that expects a 'isolated_script_test_output' argument. Thus calling flags_compatibility before the test_runner fails and there is not much room to change the argument in between the test runner and the test.

    Change-Id: I48a591743fa50484a0ec584a3f9e97d9e0fd25ef
    Bug: webrtc:14694
    Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/284541


    Commit-Queue: Jeremy Leconte <jleconte@google.com>
    Reviewed-by: default avatarMirko Bonadei <mbonadei@webrtc.org>
    Reviewed-by: default avatarArtem Titov <titovartem@webrtc.org>
    Cr-Commit-Position: refs/heads/main@{#38707}
parent 28895f74
Loading
Loading
Loading
Loading
+3 −0
Original line number Diff line number Diff line
@@ -19722,3 +19722,6 @@ dd35e244ce
# MOZ_LIBWEBRTC_SRC=/home/bcampen/checkouts/moz-libwebrtc MOZ_LIBWEBRTC_BRANCH=mozpatches bash dom/media/webrtc/third_party_build/fast-forward-libwebrtc.sh
# base of lastest vendoring
a3a3b6d798
# MOZ_LIBWEBRTC_SRC=/home/bcampen/checkouts/moz-libwebrtc MOZ_LIBWEBRTC_BRANCH=mozpatches bash dom/media/webrtc/third_party_build/fast-forward-libwebrtc.sh
# base of lastest vendoring
c6ae33fb07
+2 −0
Original line number Diff line number Diff line
@@ -13170,3 +13170,5 @@ libwebrtc updated from /home/bcampen/checkouts/moz-libwebrtc commit mozpatches o
libwebrtc updated from /home/bcampen/checkouts/moz-libwebrtc commit mozpatches on 2023-03-31T23:36:47.138202.
# ./mach python dom/media/webrtc/third_party_build/vendor-libwebrtc.py --from-local /home/bcampen/checkouts/moz-libwebrtc --commit mozpatches libwebrtc
libwebrtc updated from /home/bcampen/checkouts/moz-libwebrtc commit mozpatches on 2023-03-31T23:38:03.896437.
# ./mach python dom/media/webrtc/third_party_build/vendor-libwebrtc.py --from-local /home/bcampen/checkouts/moz-libwebrtc --commit mozpatches libwebrtc
libwebrtc updated from /home/bcampen/checkouts/moz-libwebrtc commit mozpatches on 2023-03-31T23:39:24.281378.
+10 −88
Original line number Diff line number Diff line
@@ -2097,10 +2097,6 @@
  "Fuchsia Release": {
    "isolated_scripts": [
      {
        "args": [
          "--",
          "--undefok=use-vulkan"
        ],
        "isolate_name": "audio_decoder_unittests",
        "merge": {
          "args": [],
@@ -2108,7 +2104,8 @@
        },
        "name": "audio_decoder_unittests",
        "resultdb": {
          "result_format": "json"
          "enable": true,
          "has_native_resultdb_integration": true
        },
        "swarming": {
          "can_use_on_swarming_builders": true,
@@ -2122,10 +2119,6 @@
        "test_id_prefix": "ninja://modules/audio_coding:audio_decoder_unittests/"
      },
      {
        "args": [
          "--",
          "--undefok=use-vulkan"
        ],
        "isolate_name": "common_audio_unittests",
        "merge": {
          "args": [],
@@ -2133,7 +2126,8 @@
        },
        "name": "common_audio_unittests",
        "resultdb": {
          "result_format": "json"
          "enable": true,
          "has_native_resultdb_integration": true
        },
        "swarming": {
          "can_use_on_swarming_builders": true,
@@ -2147,10 +2141,6 @@
        "test_id_prefix": "ninja://common_audio:common_audio_unittests/"
      },
      {
        "args": [
          "--",
          "--undefok=use-vulkan"
        ],
        "isolate_name": "common_video_unittests",
        "merge": {
          "args": [],
@@ -2158,7 +2148,8 @@
        },
        "name": "common_video_unittests",
        "resultdb": {
          "result_format": "json"
          "enable": true,
          "has_native_resultdb_integration": true
        },
        "swarming": {
          "can_use_on_swarming_builders": true,
@@ -2172,10 +2163,6 @@
        "test_id_prefix": "ninja://common_video:common_video_unittests/"
      },
      {
        "args": [
          "--",
          "--undefok=use-vulkan"
        ],
        "isolate_name": "dcsctp_unittests",
        "merge": {
          "args": [],
@@ -2183,7 +2170,8 @@
        },
        "name": "dcsctp_unittests",
        "resultdb": {
          "result_format": "json"
          "enable": true,
          "has_native_resultdb_integration": true
        },
        "swarming": {
          "can_use_on_swarming_builders": true,
@@ -2197,10 +2185,6 @@
        "test_id_prefix": "ninja://net/dcsctp:dcsctp_unittests/"
      },
      {
        "args": [
          "--",
          "--undefok=use-vulkan"
        ],
        "isolate_name": "low_bandwidth_audio_test",
        "merge": {
          "args": [],
@@ -2208,7 +2192,8 @@
        },
        "name": "low_bandwidth_audio_test",
        "resultdb": {
          "result_format": "json"
          "enable": true,
          "has_native_resultdb_integration": true
        },
        "swarming": {
          "can_use_on_swarming_builders": true,
@@ -9003,7 +8988,6 @@
          "iPhone X",
          "--version",
          "12.4",
          "--undefok=write-compiled-tests-json-to-writable-path",
          "--xcode-build-version",
          "13c100",
          "--out-dir",
@@ -9051,7 +9035,6 @@
          "iPhone X",
          "--version",
          "12.4",
          "--undefok=write-compiled-tests-json-to-writable-path",
          "--xcode-build-version",
          "13c100",
          "--out-dir",
@@ -9098,7 +9081,6 @@
          "iPhone X",
          "--version",
          "12.4",
          "--undefok=write-compiled-tests-json-to-writable-path",
          "--xcode-build-version",
          "13c100",
          "--out-dir",
@@ -9145,7 +9127,6 @@
          "iPhone X",
          "--version",
          "12.4",
          "--undefok=write-compiled-tests-json-to-writable-path",
          "--xcode-build-version",
          "13c100",
          "--out-dir",
@@ -9192,7 +9173,6 @@
          "iPhone X",
          "--version",
          "12.4",
          "--undefok=write-compiled-tests-json-to-writable-path",
          "--xcode-build-version",
          "13c100",
          "--out-dir",
@@ -9239,7 +9219,6 @@
          "iPhone X",
          "--version",
          "12.4",
          "--undefok=write-compiled-tests-json-to-writable-path",
          "--xcode-build-version",
          "13c100",
          "--out-dir",
@@ -9287,7 +9266,6 @@
          "iPhone X",
          "--version",
          "12.4",
          "--undefok=write-compiled-tests-json-to-writable-path",
          "--xcode-build-version",
          "13c100",
          "--out-dir",
@@ -9335,7 +9313,6 @@
          "iPhone X",
          "--version",
          "12.4",
          "--undefok=write-compiled-tests-json-to-writable-path",
          "--xcode-build-version",
          "13c100",
          "--out-dir",
@@ -9382,7 +9359,6 @@
          "iPhone X",
          "--version",
          "12.4",
          "--undefok=write-compiled-tests-json-to-writable-path",
          "--xcode-build-version",
          "13c100",
          "--out-dir",
@@ -9429,7 +9405,6 @@
          "iPhone X",
          "--version",
          "12.4",
          "--undefok=write-compiled-tests-json-to-writable-path",
          "--xcode-build-version",
          "13c100",
          "--out-dir",
@@ -9476,7 +9451,6 @@
          "iPhone X",
          "--version",
          "12.4",
          "--undefok=write-compiled-tests-json-to-writable-path",
          "--xcode-build-version",
          "13c100",
          "--out-dir",
@@ -9524,7 +9498,6 @@
          "iPhone X",
          "--version",
          "12.4",
          "--undefok=write-compiled-tests-json-to-writable-path",
          "--xcode-build-version",
          "13c100",
          "--out-dir",
@@ -9572,7 +9545,6 @@
          "iPhone X",
          "--version",
          "12.4",
          "--undefok=write-compiled-tests-json-to-writable-path",
          "--xcode-build-version",
          "13c100",
          "--out-dir",
@@ -9620,7 +9592,6 @@
          "iPhone X",
          "--version",
          "12.4",
          "--undefok=write-compiled-tests-json-to-writable-path",
          "--xcode-build-version",
          "13c100",
          "--out-dir",
@@ -9669,7 +9640,6 @@
          "iPhone X",
          "--version",
          "12.4",
          "--undefok=write-compiled-tests-json-to-writable-path",
          "--xcode-build-version",
          "13c100",
          "--out-dir",
@@ -9716,7 +9686,6 @@
          "iPhone X",
          "--version",
          "12.4",
          "--undefok=write-compiled-tests-json-to-writable-path",
          "--xcode-build-version",
          "13c100",
          "--out-dir",
@@ -9763,7 +9732,6 @@
          "iPhone X",
          "--version",
          "12.4",
          "--undefok=write-compiled-tests-json-to-writable-path",
          "--xcode-build-version",
          "13c100",
          "--out-dir",
@@ -9810,7 +9778,6 @@
          "iPhone X",
          "--version",
          "12.4",
          "--undefok=write-compiled-tests-json-to-writable-path",
          "--xcode-build-version",
          "13c100",
          "--out-dir",
@@ -9857,7 +9824,6 @@
          "iPhone X",
          "--version",
          "12.4",
          "--undefok=write-compiled-tests-json-to-writable-path",
          "--xcode-build-version",
          "13c100",
          "--out-dir",
@@ -9905,7 +9871,6 @@
          "iPhone X",
          "--version",
          "12.4",
          "--undefok=write-compiled-tests-json-to-writable-path",
          "--xcode-build-version",
          "13c100",
          "--out-dir",
@@ -9952,7 +9917,6 @@
          "iPhone X",
          "--version",
          "12.4",
          "--undefok=write-compiled-tests-json-to-writable-path",
          "--xcode-build-version",
          "13c100",
          "--out-dir",
@@ -10003,7 +9967,6 @@
          "iPhone X",
          "--version",
          "13.6",
          "--undefok=write-compiled-tests-json-to-writable-path",
          "--xcode-build-version",
          "13c100",
          "--out-dir",
@@ -10051,7 +10014,6 @@
          "iPhone X",
          "--version",
          "13.6",
          "--undefok=write-compiled-tests-json-to-writable-path",
          "--xcode-build-version",
          "13c100",
          "--out-dir",
@@ -10098,7 +10060,6 @@
          "iPhone X",
          "--version",
          "13.6",
          "--undefok=write-compiled-tests-json-to-writable-path",
          "--xcode-build-version",
          "13c100",
          "--out-dir",
@@ -10145,7 +10106,6 @@
          "iPhone X",
          "--version",
          "13.6",
          "--undefok=write-compiled-tests-json-to-writable-path",
          "--xcode-build-version",
          "13c100",
          "--out-dir",
@@ -10192,7 +10152,6 @@
          "iPhone X",
          "--version",
          "13.6",
          "--undefok=write-compiled-tests-json-to-writable-path",
          "--xcode-build-version",
          "13c100",
          "--out-dir",
@@ -10239,7 +10198,6 @@
          "iPhone X",
          "--version",
          "13.6",
          "--undefok=write-compiled-tests-json-to-writable-path",
          "--xcode-build-version",
          "13c100",
          "--out-dir",
@@ -10287,7 +10245,6 @@
          "iPhone X",
          "--version",
          "13.6",
          "--undefok=write-compiled-tests-json-to-writable-path",
          "--xcode-build-version",
          "13c100",
          "--out-dir",
@@ -10335,7 +10292,6 @@
          "iPhone X",
          "--version",
          "13.6",
          "--undefok=write-compiled-tests-json-to-writable-path",
          "--xcode-build-version",
          "13c100",
          "--out-dir",
@@ -10382,7 +10338,6 @@
          "iPhone X",
          "--version",
          "13.6",
          "--undefok=write-compiled-tests-json-to-writable-path",
          "--xcode-build-version",
          "13c100",
          "--out-dir",
@@ -10429,7 +10384,6 @@
          "iPhone X",
          "--version",
          "13.6",
          "--undefok=write-compiled-tests-json-to-writable-path",
          "--xcode-build-version",
          "13c100",
          "--out-dir",
@@ -10476,7 +10430,6 @@
          "iPhone X",
          "--version",
          "13.6",
          "--undefok=write-compiled-tests-json-to-writable-path",
          "--xcode-build-version",
          "13c100",
          "--out-dir",
@@ -10524,7 +10477,6 @@
          "iPhone X",
          "--version",
          "13.6",
          "--undefok=write-compiled-tests-json-to-writable-path",
          "--xcode-build-version",
          "13c100",
          "--out-dir",
@@ -10572,7 +10524,6 @@
          "iPhone X",
          "--version",
          "13.6",
          "--undefok=write-compiled-tests-json-to-writable-path",
          "--xcode-build-version",
          "13c100",
          "--out-dir",
@@ -10620,7 +10571,6 @@
          "iPhone X",
          "--version",
          "13.6",
          "--undefok=write-compiled-tests-json-to-writable-path",
          "--xcode-build-version",
          "13c100",
          "--out-dir",
@@ -10669,7 +10619,6 @@
          "iPhone X",
          "--version",
          "13.6",
          "--undefok=write-compiled-tests-json-to-writable-path",
          "--xcode-build-version",
          "13c100",
          "--out-dir",
@@ -10716,7 +10665,6 @@
          "iPhone X",
          "--version",
          "13.6",
          "--undefok=write-compiled-tests-json-to-writable-path",
          "--xcode-build-version",
          "13c100",
          "--out-dir",
@@ -10763,7 +10711,6 @@
          "iPhone X",
          "--version",
          "13.6",
          "--undefok=write-compiled-tests-json-to-writable-path",
          "--xcode-build-version",
          "13c100",
          "--out-dir",
@@ -10810,7 +10757,6 @@
          "iPhone X",
          "--version",
          "13.6",
          "--undefok=write-compiled-tests-json-to-writable-path",
          "--xcode-build-version",
          "13c100",
          "--out-dir",
@@ -10857,7 +10803,6 @@
          "iPhone X",
          "--version",
          "13.6",
          "--undefok=write-compiled-tests-json-to-writable-path",
          "--xcode-build-version",
          "13c100",
          "--out-dir",
@@ -10905,7 +10850,6 @@
          "iPhone X",
          "--version",
          "13.6",
          "--undefok=write-compiled-tests-json-to-writable-path",
          "--xcode-build-version",
          "13c100",
          "--out-dir",
@@ -10952,7 +10896,6 @@
          "iPhone X",
          "--version",
          "13.6",
          "--undefok=write-compiled-tests-json-to-writable-path",
          "--xcode-build-version",
          "13c100",
          "--out-dir",
@@ -11003,7 +10946,6 @@
          "iPhone X",
          "--version",
          "14.5",
          "--undefok=write-compiled-tests-json-to-writable-path",
          "--xcode-build-version",
          "13c100",
          "--out-dir",
@@ -11051,7 +10993,6 @@
          "iPhone X",
          "--version",
          "14.5",
          "--undefok=write-compiled-tests-json-to-writable-path",
          "--xcode-build-version",
          "13c100",
          "--out-dir",
@@ -11098,7 +11039,6 @@
          "iPhone X",
          "--version",
          "14.5",
          "--undefok=write-compiled-tests-json-to-writable-path",
          "--xcode-build-version",
          "13c100",
          "--out-dir",
@@ -11145,7 +11085,6 @@
          "iPhone X",
          "--version",
          "14.5",
          "--undefok=write-compiled-tests-json-to-writable-path",
          "--xcode-build-version",
          "13c100",
          "--out-dir",
@@ -11192,7 +11131,6 @@
          "iPhone X",
          "--version",
          "14.5",
          "--undefok=write-compiled-tests-json-to-writable-path",
          "--xcode-build-version",
          "13c100",
          "--out-dir",
@@ -11239,7 +11177,6 @@
          "iPhone X",
          "--version",
          "14.5",
          "--undefok=write-compiled-tests-json-to-writable-path",
          "--xcode-build-version",
          "13c100",
          "--out-dir",
@@ -11287,7 +11224,6 @@
          "iPhone X",
          "--version",
          "14.5",
          "--undefok=write-compiled-tests-json-to-writable-path",
          "--xcode-build-version",
          "13c100",
          "--out-dir",
@@ -11335,7 +11271,6 @@
          "iPhone X",
          "--version",
          "14.5",
          "--undefok=write-compiled-tests-json-to-writable-path",
          "--xcode-build-version",
          "13c100",
          "--out-dir",
@@ -11382,7 +11317,6 @@
          "iPhone X",
          "--version",
          "14.5",
          "--undefok=write-compiled-tests-json-to-writable-path",
          "--xcode-build-version",
          "13c100",
          "--out-dir",
@@ -11429,7 +11363,6 @@
          "iPhone X",
          "--version",
          "14.5",
          "--undefok=write-compiled-tests-json-to-writable-path",
          "--xcode-build-version",
          "13c100",
          "--out-dir",
@@ -11476,7 +11409,6 @@
          "iPhone X",
          "--version",
          "14.5",
          "--undefok=write-compiled-tests-json-to-writable-path",
          "--xcode-build-version",
          "13c100",
          "--out-dir",
@@ -11524,7 +11456,6 @@
          "iPhone X",
          "--version",
          "14.5",
          "--undefok=write-compiled-tests-json-to-writable-path",
          "--xcode-build-version",
          "13c100",
          "--out-dir",
@@ -11572,7 +11503,6 @@
          "iPhone X",
          "--version",
          "14.5",
          "--undefok=write-compiled-tests-json-to-writable-path",
          "--xcode-build-version",
          "13c100",
          "--out-dir",
@@ -11620,7 +11550,6 @@
          "iPhone X",
          "--version",
          "14.5",
          "--undefok=write-compiled-tests-json-to-writable-path",
          "--xcode-build-version",
          "13c100",
          "--out-dir",
@@ -11669,7 +11598,6 @@
          "iPhone X",
          "--version",
          "14.5",
          "--undefok=write-compiled-tests-json-to-writable-path",
          "--xcode-build-version",
          "13c100",
          "--out-dir",
@@ -11716,7 +11644,6 @@
          "iPhone X",
          "--version",
          "14.5",
          "--undefok=write-compiled-tests-json-to-writable-path",
          "--xcode-build-version",
          "13c100",
          "--out-dir",
@@ -11763,7 +11690,6 @@
          "iPhone X",
          "--version",
          "14.5",
          "--undefok=write-compiled-tests-json-to-writable-path",
          "--xcode-build-version",
          "13c100",
          "--out-dir",
@@ -11810,7 +11736,6 @@
          "iPhone X",
          "--version",
          "14.5",
          "--undefok=write-compiled-tests-json-to-writable-path",
          "--xcode-build-version",
          "13c100",
          "--out-dir",
@@ -11857,7 +11782,6 @@
          "iPhone X",
          "--version",
          "14.5",
          "--undefok=write-compiled-tests-json-to-writable-path",
          "--xcode-build-version",
          "13c100",
          "--out-dir",
@@ -11905,7 +11829,6 @@
          "iPhone X",
          "--version",
          "14.5",
          "--undefok=write-compiled-tests-json-to-writable-path",
          "--xcode-build-version",
          "13c100",
          "--out-dir",
@@ -11952,7 +11875,6 @@
          "iPhone X",
          "--version",
          "14.5",
          "--undefok=write-compiled-tests-json-to-writable-path",
          "--xcode-build-version",
          "13c100",
          "--out-dir",
+0 −22
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@
      {
        "args": [
          "--xctest",
          "--undefok=enable-run-ios-unittests-with-xctest,write-compiled-tests-json-to-writable-path",
          "--xcode-build-version",
          "13c100",
          "--out-dir",
@@ -50,7 +49,6 @@
      {
        "args": [
          "--xctest",
          "--undefok=enable-run-ios-unittests-with-xctest,write-compiled-tests-json-to-writable-path",
          "--xcode-build-version",
          "13c100",
          "--out-dir",
@@ -95,7 +93,6 @@
        "args": [
          "--readline-timeout=1200",
          "--xctest",
          "--undefok=enable-run-ios-unittests-with-xctest,write-compiled-tests-json-to-writable-path",
          "--xcode-build-version",
          "13c100",
          "--out-dir",
@@ -142,7 +139,6 @@
      {
        "args": [
          "--xctest",
          "--undefok=enable-run-ios-unittests-with-xctest,write-compiled-tests-json-to-writable-path",
          "--xcode-build-version",
          "13c100",
          "--out-dir",
@@ -187,7 +183,6 @@
      {
        "args": [
          "--xctest",
          "--undefok=enable-run-ios-unittests-with-xctest,write-compiled-tests-json-to-writable-path",
          "--xcode-build-version",
          "13c100",
          "--out-dir",
@@ -231,7 +226,6 @@
      {
        "args": [
          "--xctest",
          "--undefok=enable-run-ios-unittests-with-xctest,write-compiled-tests-json-to-writable-path",
          "--xcode-build-version",
          "13c100",
          "--out-dir",
@@ -275,7 +269,6 @@
      {
        "args": [
          "--xctest",
          "--undefok=enable-run-ios-unittests-with-xctest,write-compiled-tests-json-to-writable-path",
          "--xcode-build-version",
          "13c100",
          "--out-dir",
@@ -319,7 +312,6 @@
      {
        "args": [
          "--xctest",
          "--undefok=enable-run-ios-unittests-with-xctest,write-compiled-tests-json-to-writable-path",
          "--xcode-build-version",
          "13c100",
          "--out-dir",
@@ -363,7 +355,6 @@
      {
        "args": [
          "--xctest",
          "--undefok=enable-run-ios-unittests-with-xctest,write-compiled-tests-json-to-writable-path",
          "--xcode-build-version",
          "13c100",
          "--out-dir",
@@ -407,7 +398,6 @@
      {
        "args": [
          "--xctest",
          "--undefok=enable-run-ios-unittests-with-xctest,write-compiled-tests-json-to-writable-path",
          "--xcode-build-version",
          "13c100",
          "--out-dir",
@@ -451,7 +441,6 @@
      {
        "args": [
          "--xctest",
          "--undefok=enable-run-ios-unittests-with-xctest,write-compiled-tests-json-to-writable-path",
          "--xcode-build-version",
          "13c100",
          "--out-dir",
@@ -555,7 +544,6 @@
      {
        "args": [
          "--xctest",
          "--undefok=enable-run-ios-unittests-with-xctest,write-compiled-tests-json-to-writable-path",
          "--xcode-build-version",
          "13c100",
          "--out-dir",
@@ -599,7 +587,6 @@
      {
        "args": [
          "--xctest",
          "--undefok=enable-run-ios-unittests-with-xctest,write-compiled-tests-json-to-writable-path",
          "--xcode-build-version",
          "13c100",
          "--out-dir",
@@ -644,7 +631,6 @@
        "args": [
          "--readline-timeout=1200",
          "--xctest",
          "--undefok=enable-run-ios-unittests-with-xctest,write-compiled-tests-json-to-writable-path",
          "--xcode-build-version",
          "13c100",
          "--out-dir",
@@ -691,7 +677,6 @@
      {
        "args": [
          "--xctest",
          "--undefok=enable-run-ios-unittests-with-xctest,write-compiled-tests-json-to-writable-path",
          "--xcode-build-version",
          "13c100",
          "--out-dir",
@@ -736,7 +721,6 @@
      {
        "args": [
          "--xctest",
          "--undefok=enable-run-ios-unittests-with-xctest,write-compiled-tests-json-to-writable-path",
          "--xcode-build-version",
          "13c100",
          "--out-dir",
@@ -780,7 +764,6 @@
      {
        "args": [
          "--xctest",
          "--undefok=enable-run-ios-unittests-with-xctest,write-compiled-tests-json-to-writable-path",
          "--xcode-build-version",
          "13c100",
          "--out-dir",
@@ -824,7 +807,6 @@
      {
        "args": [
          "--xctest",
          "--undefok=enable-run-ios-unittests-with-xctest,write-compiled-tests-json-to-writable-path",
          "--xcode-build-version",
          "13c100",
          "--out-dir",
@@ -868,7 +850,6 @@
      {
        "args": [
          "--xctest",
          "--undefok=enable-run-ios-unittests-with-xctest,write-compiled-tests-json-to-writable-path",
          "--xcode-build-version",
          "13c100",
          "--out-dir",
@@ -912,7 +893,6 @@
      {
        "args": [
          "--xctest",
          "--undefok=enable-run-ios-unittests-with-xctest,write-compiled-tests-json-to-writable-path",
          "--xcode-build-version",
          "13c100",
          "--out-dir",
@@ -956,7 +936,6 @@
      {
        "args": [
          "--xctest",
          "--undefok=enable-run-ios-unittests-with-xctest,write-compiled-tests-json-to-writable-path",
          "--xcode-build-version",
          "13c100",
          "--out-dir",
@@ -1000,7 +979,6 @@
      {
        "args": [
          "--xctest",
          "--undefok=enable-run-ios-unittests-with-xctest,write-compiled-tests-json-to-writable-path",
          "--xcode-build-version",
          "13c100",
          "--out-dir",
+4 −21
Original line number Diff line number Diff line
@@ -59,11 +59,6 @@
      }
    }
  },
  'fuchsia': {
    '$mixin_append': {
      'args': ['--', '--undefok=use-vulkan']
    }
  },
  'hammerhead': {
    'swarming': {
      'dimensions': {
@@ -98,10 +93,7 @@
  },
  'ios-simulator-12.4': {
    '$mixin_append': {
      'args': [
        '--platform', 'iPhone X', '--version', '12.4',
        '--undefok=write-compiled-tests-json-to-writable-path'
      ],
      'args': ['--platform', 'iPhone X', '--version', '12.4'],
      'swarming': {
        'named_caches': [{
          'name': 'runtime_ios_12_4',
@@ -112,10 +104,7 @@
  },
  'ios-simulator-13.6': {
    '$mixin_append': {
      'args': [
        '--platform', 'iPhone X', '--version', '13.6',
        '--undefok=write-compiled-tests-json-to-writable-path'
      ],
      'args': ['--platform', 'iPhone X', '--version', '13.6'],
      'swarming': {
        'named_caches': [{
          'name': 'runtime_ios_13_6',
@@ -126,10 +115,7 @@
  },
  'ios-simulator-14.5': {
    '$mixin_append': {
      'args': [
        '--platform', 'iPhone X', '--version', '14.5',
        '--undefok=write-compiled-tests-json-to-writable-path'
      ],
      'args': ['--platform', 'iPhone X', '--version', '14.5'],
      'swarming': {
        'named_caches': [{
          'name': 'runtime_ios_14_5',
@@ -309,10 +295,7 @@
  },
  'webrtc-xctest': {
    '$mixin_append': {
      'args': [
        '--xctest',
        '--undefok=enable-run-ios-unittests-with-xctest,write-compiled-tests-json-to-writable-path'
      ]
      'args': ['--xctest']
    }
  },
  'win10': {
Loading