1973648 - Add/document convenient way of overriding libwebrtc files

Status: RESOLVED FIXED

(Core :: WebRTC, task, P3)

Description

[Andreas Pehrson [:pehrsons]]

This is filed per https://phabricator.services.mozilla.com/D254341#8802587

We'd like a better way to override libwebrtc headers/impls than explicitly modifying those files explicitly -- something in the build system.

Candidates to apply this to: api/location.h, rtc_base/system_time.cc.

Also see Chromium's webrtc_overrides where they do this.

Comment 1

[Michael Froman [:mjf]]

Attachment: Bug 1973648 - move applicable libwebrtc changes to our new libwebrtc_overrides location. r?ng!

Comment 2

[Michael Froman [:mjf]]

Attachment: Bug 1973648 - update the vendoring exclude list. r?ng!

Comment 3

[Michael Froman [:mjf]]

Attachment: Bug 1973648 - re-vendor to delete files now excluded during vendoring. r?ng!

Comment 4

[Michael Froman [:mjf]]

Attachment: Bug 1973648 - add '!/dist/include/libwebrtc_overrides' to places that include third_party/libwebrtc. r?ng!

Comment 5

[Michael Froman [:mjf]]

Attachment: Bug 1973648 - add dist/include/libwebrtc_overrides to all libwebrtc includes in gn_processor.py r?ng!

Comment 6

[Michael Froman [:mjf]]

Attachment: Bug 1973648 - update generated moz.build files. r?ng!

Comment 7

[Pulsebot]

Pushed by [e-mail]:
https://github.com/mozilla-firefox/firefox/commit/ad763d76f042
https://hg.mozilla.org/integration/autoland/rev/70682afe4bae
move applicable libwebrtc changes to our new libwebrtc_overrides location. r=ng
https://github.com/mozilla-firefox/firefox/commit/1bdb4de8a559
https://hg.mozilla.org/integration/autoland/rev/416d9842502a
update the vendoring exclude list. r=ng
https://github.com/mozilla-firefox/firefox/commit/f9107c00d9cb
https://hg.mozilla.org/integration/autoland/rev/b538e1a3c570
re-vendor to delete files now excluded during vendoring. r=ng
https://github.com/mozilla-firefox/firefox/commit/28421338bb82
https://hg.mozilla.org/integration/autoland/rev/2d5b1263940e
add '!/dist/include/libwebrtc_overrides' to places that include third_party/libwebrtc. r=ng
https://github.com/mozilla-firefox/firefox/commit/992fbe24587f
https://hg.mozilla.org/integration/autoland/rev/0251d01b9da8
add dist/include/libwebrtc_overrides to all libwebrtc includes in gn_processor.py r=ng
https://github.com/mozilla-firefox/firefox/commit/0e08504b66fe
https://hg.mozilla.org/integration/autoland/rev/337cb5aa4156
update generated moz.build files. r=ng

Comment 8

[agoloman]

Backed out for causing build bustages @x_error_trap.h.

• Backout link
• Push with failures
• Failure Log

Comment 9

[Pulsebot]

Pushed by [e-mail]:
https://github.com/mozilla-firefox/firefox/commit/4e7b0a8ad812
https://hg.mozilla.org/integration/autoland/rev/19164e58323d
move applicable libwebrtc changes to our new libwebrtc_overrides location. r=ng
https://github.com/mozilla-firefox/firefox/commit/71deb53da4e8
https://hg.mozilla.org/integration/autoland/rev/b7974d218a25
update the vendoring exclude list. r=ng
https://github.com/mozilla-firefox/firefox/commit/b5fd24b652e8
https://hg.mozilla.org/integration/autoland/rev/519bc3ce648c
re-vendor to delete files now excluded during vendoring. r=ng
https://github.com/mozilla-firefox/firefox/commit/da05a094bcd9
https://hg.mozilla.org/integration/autoland/rev/9407a3db2ccc
add '!/dist/include/libwebrtc_overrides' to places that include third_party/libwebrtc. r=ng
https://github.com/mozilla-firefox/firefox/commit/f1bdf81fbca4
https://hg.mozilla.org/integration/autoland/rev/0869d45b66ed
add dist/include/libwebrtc_overrides to all libwebrtc includes in gn_processor.py r=ng
https://github.com/mozilla-firefox/firefox/commit/1eba26161fea
https://hg.mozilla.org/integration/autoland/rev/817ce0936357
update generated moz.build files. r=ng

Comment 10

[Cristina Horotan [:chorotan]]

https://hg.mozilla.org/mozilla-central/rev/19164e58323d
https://hg.mozilla.org/mozilla-central/rev/b7974d218a25
https://hg.mozilla.org/mozilla-central/rev/519bc3ce648c
https://hg.mozilla.org/mozilla-central/rev/9407a3db2ccc
https://hg.mozilla.org/mozilla-central/rev/0869d45b66ed
https://hg.mozilla.org/mozilla-central/rev/817ce0936357

Comment 11

[Landry Breuil (:gaston)]

i dunno yet if i should file a followup/regressor bug, but the build fails here on OpenBSD:

38:56.05 dom/media/webrtc/libwebrtc_overrides
38:58.76 In file included from Unified_cpp_libwebrtc_overrides0.cpp:11:
38:58.76 In file included from /build/buildslave-amd64/mozilla-central-amd64/build/dom/media/webrtc/libwebrtc_overrides/modules/desktop_capture/linux/x11/x_error_trap.cc:7:
38:58.76 In file included from /build/buildslave-amd64/mozilla-central-amd64/build/dom/media/webrtc/libwebrtc_overrides/modules/desktop_capture/linux/x11/x_error_trap.h:10:
38:58.76 /usr/obj/buildslave/mozilla-central/dist/system_wrappers/X11/Xlibint.h:3:15: fatal error: 'X11/Xlibint.h' file not found
38:58.76     3 | #include_next <X11/Xlibint.h>
38:58.76       |               ^~~~~~~~~~~~~~~
38:58.77 1 error generated.

maybe with the changes in this bug the path to X11 headers (eg MOZ_X11_CFLAGS contains ['-I/usr/X11R6/include']) isnt propagated to moz.build files ?

Comment 12

[Michael Froman [:mjf]]

(In reply to Landry Breuil (:gaston) from comment #11)

i dunno yet if i should file a followup/regressor bug, but the build fails here on OpenBSD:

38:56.05 dom/media/webrtc/libwebrtc_overrides
38:58.76 In file included from Unified_cpp_libwebrtc_overrides0.cpp:11:
38:58.76 In file included from /build/buildslave-amd64/mozilla-central-amd64/build/dom/media/webrtc/libwebrtc_overrides/modules/desktop_capture/linux/x11/x_error_trap.cc:7:
38:58.76 In file included from /build/buildslave-amd64/mozilla-central-amd64/build/dom/media/webrtc/libwebrtc_overrides/modules/desktop_capture/linux/x11/x_error_trap.h:10:
38:58.76 /usr/obj/buildslave/mozilla-central/dist/system_wrappers/X11/Xlibint.h:3:15: fatal error: 'X11/Xlibint.h' file not found
38:58.76     3 | #include_next <X11/Xlibint.h>
38:58.76       |               ^~~~~~~~~~~~~~~
38:58.77 1 error generated.

Please do file a follow-up bug. I'll take a patch if you have it. If not, I'll try to spin up an OpenBSD VM.