[tbb-commits] [tor-browser] 25/179: Bug 1773223 - Remove instructions about libwebrtc and depot_tools. r=mjf, a=RyanVM

gitolite role git at cupani.torproject.org
Fri Aug 19 08:35:22 UTC 2022


This is an automated email from the git hooks/post-receive script.

pierov pushed a commit to branch tor-browser-102.2.0esr-12.0-1
in repository tor-browser.

commit eda56fa8071426976b817fbdb2ab898af2bd5e90
Author: Mike Hommey <mh+mozilla at glandium.org>
AuthorDate: Wed Jun 15 07:06:06 2022 +0000

    Bug 1773223 - Remove instructions about libwebrtc and depot_tools. r=mjf, a=RyanVM
    
    They don't appear necessary when generating the gn-derived moz.build
    files.
    
    Differential Revision: https://phabricator.services.mozilla.com/D149203
---
 .../webrtc/third_party_build/gn-configs/README.md  | 32 ++--------------------
 .../gn-configs/generate-gn-build-files.sh          | 17 ------------
 2 files changed, 3 insertions(+), 46 deletions(-)

diff --git a/dom/media/webrtc/third_party_build/gn-configs/README.md b/dom/media/webrtc/third_party_build/gn-configs/README.md
index 09dea1ae87833..101e02a336178 100644
--- a/dom/media/webrtc/third_party_build/gn-configs/README.md
+++ b/dom/media/webrtc/third_party_build/gn-configs/README.md
@@ -24,20 +24,7 @@
    The aarch64 Rust target will need to be installed via:
    `rustup target add aarch64-pc-windows-msvc`
 
-3. See information in `third_party/libwebrtc/README.mozilla` for the proper
-   revision of libwebrtc
-
-        libwebrtc updated from commit https://github.com/mozilla/libwebrtc/archive/149d693483e9055f574d9d65b01fe75a186b654b.tar.gz on 2020-11-30T15:48:48.472088.
-        third_party updated from commit https://chromium.googlesource.com/chromium/src/third_party/+archive/5dc5a4a45df9592baa8e8c5f896006d9193d8e45.tar.gz on 2020-11-30T17:00:15.612630.
-
-   In our current case, the revision is `149d693483e9055f574d9d65b01fe75a186b654b`
-   which corresponds to:
-
-        mozilla-modifications-rel86
-
-   This commit was made on `Thu Nov 19 14:14:00 2020`.
-
-4. Download a version of the `gn` executable that corresponds to
+3. Download a version of the `gn` executable that corresponds to
     `Thu Nov 19 14:14:00 2020`.  In our case, that is version `1889 (8fe02009)`.
    
    - [Win](https://chrome-infra-packages.appspot.com/p/gn/gn/windows-amd64/+/e_UmTHedzuu4zJ2gdpW8jrFFNnzIhThljx3jn3RMlVsC)
@@ -65,20 +52,7 @@
 
         (cd gn && git checkout 31f2bba8)
 
-5. Clone `depot_tools` from [depot_tools](https://chromium.googlesource.com/chromium/tools/depot_tools.git)
-
-        git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git
-        export DEPOT_TOOLS=`pwd`/depot_tools
-
-   Now, we need to checkout a revision of `depot_tools` that corresponds to the
-   date of our libwebrtc branch.  The closest `depot_tools` commit to
-   `Thu Nov 19 14:14:00 2020` is `e7d1862b155ac3ccbef72c4d70629b5c88ffcb32`.
-   There is additional information on how to more automatically determine this
-   [here](https://chromium.googlesource.com/chromium/src/+/master/docs/building_old_revisions.md).
-
-        (cd depot_tools ; git checkout e7d1862b155ac3ccbef72c4d70629b5c88ffcb32 )
-
-6. It is time to generate the build files.  The script should be run from the
+4. It is time to generate the build files.  The script should be run from the
    top directory of our firefox tree.
 
         bash ./dom/media/webrtc/third_party_build/gn-configs/generate-gn-build-files.sh
@@ -87,7 +61,7 @@
    setting the DEBUG_GEN environment variable to a non-empty value. This will 
    print everything that the script executes.
 
-7. Checkin all the generated/modified files and try your build!
+5. Checkin all the generated/modified files and try your build!
 
 # Adding new configurations to the build
 
diff --git a/dom/media/webrtc/third_party_build/gn-configs/generate-gn-build-files.sh b/dom/media/webrtc/third_party_build/gn-configs/generate-gn-build-files.sh
index d47b5da3f5103..e941ddea47a6e 100755
--- a/dom/media/webrtc/third_party_build/gn-configs/generate-gn-build-files.sh
+++ b/dom/media/webrtc/third_party_build/gn-configs/generate-gn-build-files.sh
@@ -20,17 +20,6 @@ else
   exit
 fi
 
-if [ "x$DEPOT_TOOLS" = "x" ]; then
-  echo "DEPOT_TOOLS is not defined, see README.md"
-  exit
-fi
-
-if [ -d $DEPOT_TOOLS ]; then
-  echo "DEPOT_TOOLS is $DEPOT_TOOLS"
-else
-  echo "Path $DEPOT_TOOLS is not found, see README.md"
-fi
-
 # After this point:
 # * eE: All commands should succede.
 # * u: All variables should be defined before use.
@@ -69,7 +58,6 @@ if [ "x$SYS_NAME" = "xDarwin" ]; then
   CONFIGS="x64_False_arm64_mac x64_True_arm64_mac x64_False_x64_mac x64_True_x64_mac"
   IS_DARWIN=1
 elif [ "x$SYS_NAME" = "xMINGW32_NT-6.2" ]; then
-  export DEPOT_TOOLS_WIN_TOOLCHAIN=0
   unset ANSICON
   CONFIGS="x64_True_arm64_win x64_False_arm64_win"
   CONFIGS="$CONFIGS x64_True_x64_win x64_False_x64_win"
@@ -96,11 +84,6 @@ else
   IS_LINUX=1
 fi
 
-# The path to DEPOT_TOOLS should be on our path, and make sure that it doesn't
-# auto-update.
-export PATH=$DEPOT_TOOLS:$PATH
-export DEPOT_TOOLS_UPDATE=0
-
 CONFIG_DIR=dom/media/webrtc/third_party_build/gn-configs
 echo "CONFIG_DIR is $CONFIG_DIR"
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the tbb-commits mailing list