Skip to content

Commit

Permalink
Bug 1766646 - Vendor libwebrtc from 69e7348dc6
Browse files Browse the repository at this point in the history
Upstream commit: https://webrtc.googlesource.com/src/+/69e7348dc6e72b94884e2cd80981d7d6fd983ded
    Roll chromium_revision 6effd442e8..45304a5b38 (999303:999433)

    Change log: https://chromium.googlesource.com/chromium/src/+log/6effd442e8..45304a5b38
    Full diff: https://chromium.googlesource.com/chromium/src/+/6effd442e8..45304a5b38

    Changed dependencies
    * src/base: https://chromium.googlesource.com/chromium/src/base/+log/1eefedb688..0b272249b6
    * src/build: https://chromium.googlesource.com/chromium/src/build/+log/d7c4eab611..c5ff734ecb
    * src/buildtools/third_party/libunwind/trunk: https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git/+log/393e3eee99..f1108b6ba3
    * src/ios: https://chromium.googlesource.com/chromium/src/ios/+log/e0fba2731c..3170f27462
    * src/testing: https://chromium.googlesource.com/chromium/src/testing/+log/3ac36968b2..fa918eb7ae
    * src/third_party: https://chromium.googlesource.com/chromium/src/third_party/+log/dea6018eca..e3744eedbc
    * src/third_party/perfetto: https://android.googlesource.com/platform/external/perfetto.git/+log/f8b405298b..69bc804a18
    * src/tools: https://chromium.googlesource.com/chromium/src/tools/+log/42973cc977..ded0ab1e86
    DEPS diff: https://chromium.googlesource.com/chromium/src/+/6effd442e8..45304a5b38/DEPS

    No update to Clang.

    BUG=None

    Change-Id: I03f0b22baffe72169594e971adefc0401608079d
    Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/261141
    Bot-Commit: Autoroller <[email protected]>
    Commit-Queue: Autoroller <[email protected]>
    Cr-Commit-Position: refs/heads/main@{#36763}
  • Loading branch information
mfromanmoz authored and cgsheeh committed Aug 30, 2022
1 parent 25208d5 commit 9f29110
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 9 deletions.
18 changes: 9 additions & 9 deletions third_party/libwebrtc/DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ vars = {
# chromium waterfalls. More info at: crbug.com/570091.
'checkout_configuration': 'default',
'checkout_instrumented_libraries': 'checkout_linux and checkout_configuration == "default"',
'chromium_revision': '6effd442e836ea946155f20d3aef75c78a42e43e',
'chromium_revision': '45304a5b38e19561d4d9dbfd3f438b488a842411',

# Keep the Chromium default of generating location tags.
'generate_location_tags': True,
Expand All @@ -23,9 +23,9 @@ deps = {
# TODO(kjellander): Move this to be Android-only once the libevent dependency
# in base/third_party/libevent is solved.
'src/base':
'https://chromium.googlesource.com/chromium/src/base@1eefedb688019f80838b0276be69bd7d1e2dfc59',
'https://chromium.googlesource.com/chromium/src/base@0b272249b6e18a112d96dd7379986b17348c72a1',
'src/build':
'https://chromium.googlesource.com/chromium/src/build@d7c4eab611c66e6d44eadba8c2de3acf04843fb6',
'https://chromium.googlesource.com/chromium/src/build@c5ff734ecb79b90a4b85a90d47b12d76f25caad3',
'src/buildtools':
'https://chromium.googlesource.com/chromium/src/buildtools@113378f9b3aff02ba827411ea1b7ad462cffae02',
# Gradle 6.6.1. Used for testing Android Studio project generation for WebRTC.
Expand All @@ -34,13 +34,13 @@ deps = {
'condition': 'checkout_android',
},
'src/ios': {
'url': 'https://chromium.googlesource.com/chromium/src/ios@e0fba2731ca1a43f06d3ba46c85eb4c20cc50808',
'url': 'https://chromium.googlesource.com/chromium/src/ios@3170f27462702a51c7298aea46fb51ada553faa5',
'condition': 'checkout_ios',
},
'src/testing':
'https://chromium.googlesource.com/chromium/src/testing@3ac36968b294c90996aebeb5f28c23e61f54b37a',
'https://chromium.googlesource.com/chromium/src/testing@fa918eb7ae4b3ecf290e9b4d0758ed86b0b6e7e5',
'src/third_party':
'https://chromium.googlesource.com/chromium/src/third_party@dea6018eca8ab5a6835758e90f0f5f6d0655673e',
'https://chromium.googlesource.com/chromium/src/third_party@e3744eedbc79fc320e34a8226b6eec59f7b46c4b',

'src/buildtools/linux64': {
'packages': [
Expand Down Expand Up @@ -80,7 +80,7 @@ deps = {
'src/buildtools/third_party/libc++abi/trunk':
'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git@ce96725bdddd44e1302417f22634e369531ff25c',
'src/buildtools/third_party/libunwind/trunk':
'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git@393e3eee998d163753894939ab574dc57b08c7f3',
'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git@f1108b6ba347b4d22f6354c0e5eba3b6e4972ee1',

'src/third_party/android_system_sdk': {
'packages': [
Expand Down Expand Up @@ -220,7 +220,7 @@ deps = {
'condition': 'checkout_android',
},
'src/third_party/perfetto':
'https://android.googlesource.com/platform/external/perfetto.git@f8b405298bd883ba95f7a14acfce230b37487ad3',
'https://android.googlesource.com/platform/external/perfetto.git@69bc804a183b29d2eeaa9a61a589127db9228fe1',
'src/third_party/libvpx/source/libvpx':
'https://chromium.googlesource.com/webm/libvpx.git@665f6a3065555317e75915af2561cf9b776e50b6',
'src/third_party/libyuv':
Expand Down Expand Up @@ -275,7 +275,7 @@ deps = {
'condition': 'checkout_win',
},
'src/tools':
'https://chromium.googlesource.com/chromium/src/tools@42973cc9777c70e136a3407e46fa9c676dffc7c2',
'https://chromium.googlesource.com/chromium/src/tools@ded0ab1e86d113ca5085939fa2dad7c49e71b573',

'src/third_party/accessibility_test_framework': {
'packages': [
Expand Down
3 changes: 3 additions & 0 deletions third_party/libwebrtc/README.moz-ff-commit
Original file line number Diff line number Diff line change
Expand Up @@ -13827,3 +13827,6 @@ e487e440a7
# MOZ_LIBWEBRTC_SRC=/home/mfroman/git-checkouts/trial-webrtc-builds/moz-libwebrtc-checkout/src MOZ_LIBWEBRTC_COMMIT=mjfdev bash dom/media/webrtc/third_party_build/fast-forward-libwebrtc.sh
# base of lastest vendoring
9e334b7d99
# MOZ_LIBWEBRTC_SRC=/home/mfroman/git-checkouts/trial-webrtc-builds/moz-libwebrtc-checkout/src MOZ_LIBWEBRTC_COMMIT=mjfdev bash dom/media/webrtc/third_party_build/fast-forward-libwebrtc.sh
# base of lastest vendoring
69e7348dc6
2 changes: 2 additions & 0 deletions third_party/libwebrtc/README.mozilla
Original file line number Diff line number Diff line change
Expand Up @@ -9230,3 +9230,5 @@ libwebrtc updated from /home/mfroman/git-checkouts/trial-webrtc-builds/moz-libwe
libwebrtc updated from /home/mfroman/git-checkouts/trial-webrtc-builds/moz-libwebrtc-checkout/src commit mjfdev on 2022-07-14T18:44:54.414776.
# python3 vendor-libwebrtc.py --from-local /home/mfroman/git-checkouts/trial-webrtc-builds/moz-libwebrtc-checkout/src --commit mjfdev libwebrtc
libwebrtc updated from /home/mfroman/git-checkouts/trial-webrtc-builds/moz-libwebrtc-checkout/src commit mjfdev on 2022-07-14T18:45:33.878973.
# python3 vendor-libwebrtc.py --from-local /home/mfroman/git-checkouts/trial-webrtc-builds/moz-libwebrtc-checkout/src --commit mjfdev libwebrtc
libwebrtc updated from /home/mfroman/git-checkouts/trial-webrtc-builds/moz-libwebrtc-checkout/src commit mjfdev on 2022-07-14T18:46:38.158841.

0 comments on commit 9f29110

Please sign in to comment.