Media/WebRTC/libwebrtc Update Process: Difference between revisions

Media/WebRTC/libwebrtc Update Process (view source)

17 bytes added , 16 June 2023

better notes on handling a botched rebase conflict and using restore_patch_stack.py

123

edits

@@ Line 72: / Line 72: @@
 * While loop-ff.sh is running, in a separate terminal window it may be helpful to see the overall progress by running:
   tail -f .moz-fast-forward/logs/log-loop-ff.txt | grep loop-ff
-* If a particularly complicated rebase conflict is encountered, it is helpful to tar up the moz-libwebrtc directory to allow a complete reset without losing current progress.
+* If a particularly complicated rebase conflict is encountered, it is possible to start over the most recent vendoring step by resetting some state and restoring the patch stack.
-  (cd {path-to}/moz-central && rm log_resume.txt) # resets the resume logic in loop-ff.sh
+  rm .moz-fast-forward/fast_forward.resume # resets the resume logic in loop-ff.sh
-  (cd {path-to}/moz-libwebrtc && git rebase --abort) # don't finish this rebase
+  hg revert third_party/libwebrtc && hg purge third_party/libwebrtc
-  (cd {path-to}/moz-libwebrtc/.. && tar czf moz-libwebrtc.tar.gz && cd moz-libwebrtc)
+  ./mach python dom/media/webrtc/third_party_build/restore_patch_stack.py --repo-path .moz-fast-forward/moz-libwebrtc
 * Stopping the loop-ff.sh manually is best done when in the <code>Test build</code> phase using Ctrl-c.
 * [[libwebrtc GYP generated Java files|GYP generated Java files]]