1818386 - teach vendor-libwebrtc.py how to exclude specific files when vendoring

Status: RESOLVED FIXED

(Core :: WebRTC, task, P2)

Description

[Michael Froman [:mjf]]

In Bug 1654112, we deleted a group of android java files that cause build issues are unused. However, having those files deleted in our github patch stack causes frequent rebase conflicts when upstream touches any of the files.

By teaching the vendoring script how to exclude specific files, we can remove the patch in our github patch stack that removes those files (avoid rebase conflicts) while continuing to exclude them from our build.

Comment 1

[Michael Froman [:mjf]]

https://treeherder.mozilla.org/jobs?repo=try&revision=5c956787eda2d276ad4cbe79319356bc376fd78d

Comment 2

[Michael Froman [:mjf]]

Attachment: Bug 1818386 - pt1 - restore deleted java files from 'Bug 1654112 - Remove unnecessary files.' r?ng!

Note, because libwebrtc has changed some of these files since we removed them for
Bug 1654112, these are restoring to the our current pull of libwebrtc (at the moment,
v108), not simply reversing the deletion in Bug 1654112.

Comment 3

[Michael Froman [:mjf]]

Attachment: Bug 1818386 - pt2 - add generated files for NetworkPreference.java and Priority.java r?ng!

They were generated from 4c49190ac9cb96033a0ed990816351b2d40fd47f

If you're playing along at home, these files can be regenerated
by following these steps:
git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git
export PATH=pwd/depot_tools:$PATH
mkdir webrtc_android
cd webrtc_android
fetch --nohooks --no-history webrtc_android
( cd src ; ./build/install-build-deps.sh )
gclient runhooks
cd src
gn gen out/Debug --args='target_os="android" target_cpu="arm"'
autoninja -C out/Debug

After the build completes (lengthy), you will find the files under:
out/Debug/gen/sdk/android/peerconnection_java/generated_java/input_srcjars/org/webrtc

Depends on D170704

Comment 4

[Michael Froman [:mjf]]

Attachment: Bug 1818386 - pt3 - add rawtypes warning suppression where libwebrtc java files use raw Map r?ng!

Depends on D170705

Comment 5

[Michael Froman [:mjf]]

Attachment: Bug 1818386 - teach vendor-libwebrtc.py how to exclude specific files from vendoring. r?ng!

In the past, we have deleted a group of unused java files in our github patch stack.
That causes rebase conflicts when upstream edits any of those java files. Teaching
our vendoring script how to exclude those files will allow us to remove that patch
from our patch stack (avoid rebase conflicts) while also not including them in our
builds.

Comment 6

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/36c90d1deae8
teach vendor-libwebrtc.py how to exclude specific files from vendoring. r=ng DONTBUILD

Comment 7

[Cosmin Sabou [:CosminS]]

https://hg.mozilla.org/mozilla-central/rev/36c90d1deae8