In Bug 1654112, we deleted a group of android java files that caused build issues. However, having those files deleted in our github patch stack causes frequent rebase conflicts when upstream touches any of the files. One of the build issues was a result of missing a few files that are auto-generated during the upstream libwebrtc build. Bug 1780582 added one file (VideoFrameBufferType.java). By adding 2 additional generated files, plus a supressing a couple warning about upstream using the raw type, Map, we can re-add these files and avoid an entire category of rebase conflicts.
Bug 1818386 Comment 0 Edit History
Note: The actual edited comment in the bug view page will always show the original commenter’s name and original timestamp.
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.