139
edits
(Starting the GN file generation process section) |
(Clarifying the differences between the two new repos) |
||
| Line 25: | Line 25: | ||
By only removing files via the vendoring script, we will be able to more easily roll our version forward. As it is today, we will first need to undo all of our local deletions before we begin the merge process. | By only removing files via the vendoring script, we will be able to more easily roll our version forward. As it is today, we will first need to undo all of our local deletions before we begin the merge process. | ||
===Process=== | ===Process=== | ||
====Creating | ====Creating A New Repository To Track Upstream==== | ||
The | The upstream tracking repository needs to be created in GitHub, which is tracked by [https://bugzilla.mozilla.org/show_bug.cgi?id=1654435 Bug 1654435]. This keeps the work in the native VCS, in a visible place with a review process. | ||
====Creating A User Repository To Hold The Merge Work==== | |||
A Mozilla user repository has been created [https://hg.mozilla.org/users/na-g_nostrum.com/libwebrtc-merge-2H2020 here]. All of the revisions related to modifying Gecko during the merge will be kept here after being reviewed. | |||
====Generating GN files and updating the build==== | ====Generating GN files and updating the build==== | ||
# Check out a current version of the Google depot_tools; this provides `gn`. | # Check out a current version of the Google depot_tools; this provides `gn`. | ||
# Check out a copy of the version of libwebrtc to be vendored | # Check out a copy of the version of libwebrtc to be vendored | ||
# Add the version of `gn` that exists in the checkout to your path *ahead* of the version of `gn` included in the depot_tools | # Add the version of `gn` that exists in the checkout to your path *ahead* of the version of `gn` included in the depot_tools | ||
edits