tor-browser

commit e46d0861f906b7871d68735a0a2bf2017b234dd0
parent 654e2800514174ef09fbf57b09496387d23f498e
Author: Michael Froman <mfroman@mozilla.com>
Date:   Wed,  8 Oct 2025 17:00:38 -0500

Bug 1993083 - Vendor libwebrtc from 43f724dcac

Upstream commit: https://webrtc.googlesource.com/src/+/43f724dcac00482e73bec910572fb68e776d35d7
    Ensure --output-dir is under SRC_DIR in tools_webrtc/ios/build_ios_libs.py

    After migrating the script to use Siso, the script doesn't work
    if the output dir isn't under SRC_DIR.
    https://webrtc-review.googlesource.com/c/src/+/391480/comments/f8acc07e_f5d582a1

    This CL adds a check to show a user friendly error.

    Bug: b/412968361
    Change-Id: Ib7cf46390caa5b1477d2e43f3aec730dfc90e03d
    Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/398000
    Commit-Queue: Christoffer Dewerin <jansson@webrtc.org>
    Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
    Auto-Submit: Junji Watanabe <jwata@google.com>
    Reviewed-by: Christoffer Dewerin <jansson@webrtc.org>
    Cr-Commit-Position: refs/heads/main@{#45026}

Diffstat:
M
third_party/libwebrtc/README.mozilla.last-vendor
 | 
4
++--
M
third_party/libwebrtc/tools_webrtc/ios/build_ios_libs.py
 | 
5
+++++

2 files changed, 7 insertions(+), 2 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-08T21:59:27.254249+00:00.
+libwebrtc updated from /home/mfroman/mozilla/elm/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2025-10-08T22:00:29.428940+00:00.
 # base of lastest vendoring
-5fd1d990ab
+43f724dcac
diff --git a/third_party/libwebrtc/tools_webrtc/ios/build_ios_libs.py b/third_party/libwebrtc/tools_webrtc/ios/build_ios_libs.py
@@ -15,6 +15,7 @@ By default, the library is created in out_ios_libs/. (Change with -o.)
 import argparse
 import logging
 import os
+import pathlib
 import shutil
 import subprocess
 import sys
@@ -228,6 +229,10 @@ def main():
 
     logging.basicConfig(level=logging.DEBUG if args.verbose else logging.INFO)
 
+    if not pathlib.Path(args.output_dir).is_relative_to(SRC_DIR):
+        logging.error('--output-dir must be under %s.', SRC_DIR)
+        return 1
+
     if args.clean:
         _CleanArtifacts(args.output_dir)
         return 0