zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reference "main" branches instead of "master" branches.

Browse Source 
Both WebRTC and Chromium have migrated from the "master" to the "main" branch.

TBR=hta@webrtc.org

Bug: None
Change-Id: I2b5e6973bdd8fdc9c1bd96e2747a8a9ac2630b14
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/226080
Commit-Queue: Fanny Linderborg <linderborg@webrtc.org>
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#34475}
This commit is contained in:
Fanny Linderborg
2021-07-14 14:02:11 +00:00
committed by WebRTC LUCI CQ
parent 621002e39f
commit 0d2dc1f38f
14 changed files with 42 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
docs/native-code/android/index.md
View File

@ -150,9 +150,9 @@ If want to run Release builds instead; pass `is_debug=false` to GN (and
preferably generate the projects files into a directory like `out/Release`).
Then use the scripts generated in `out/Release/bin` instead.
[webrtc-prerequisite-sw]: https://webrtc.googlesource.com/src/+/refs/heads/master/docs/native-code/development/prerequisite-sw/index.md
[webrtc-jni-doc]: https://webrtc.googlesource.com/src/+/master/sdk/android/README
[apprtc-doc]: https://webrtc.googlesource.com/src/+/master/examples/androidapp/README
[webrtc-prerequisite-sw]: https://webrtc.googlesource.com/src/+/main/docs/native-code/development/prerequisite-sw/index.md
[webrtc-jni-doc]: https://webrtc.googlesource.com/src/+/main/sdk/android/README
[apprtc-doc]: https://webrtc.googlesource.com/src/+/main/examples/androidapp/README
[ninja]: https://ninja-build.org/
[prebuilt-libraries]: https://bintray.com/google/webrtc/google-webrtc
[webrtc-development]: https://webrtc.googlesource.com/src/+/refs/heads/master/docs/native-code/development/index.md
[webrtc-development]: https://webrtc.googlesource.com/src/+/main/docs/native-code/development/index.md

18
docs/native-code/development/index.md
View File

@ -9,7 +9,7 @@ pages for build instructions and example applications specific to these mobile p
First, be sure to install the [prerequisite software][webrtc-prerequisite-sw].
[webrtc-prerequisite-sw]: https://webrtc.googlesource.com/src/+/refs/heads/master/docs/native-code/development/prerequisite-sw/index.md
[webrtc-prerequisite-sw]: https://webrtc.googlesource.com/src/+/main/docs/native-code/development/prerequisite-sw/index.md
## Getting the Code
@ -44,7 +44,7 @@ $ git config branch.autosetuprebase always
```
$ cd src
$ git checkout master
$ git checkout main
$ git new-branch your-branch-name
```
@ -58,11 +58,11 @@ make sure you're logged in. The quota is much larger for logged in users.
Update your current branch with:
```
$ git checkout master
$ git pull origin master
$ git checkout main
$ git pull origin main
$ gclient sync
$ git checkout my-branch
$ git merge master
$ git merge main
```
## Building
@ -168,7 +168,7 @@ $ git checkout <hash>
$ cd ~/dev/webrtc/src
$ gclient sync
$ # When done, go back to depot_tools, git reset --hard, run gclient again and
$ # verify the current branch becomes REMOTE:origin/master
$ # verify the current branch becomes REMOTE:origin/main
```
The above is untested and unsupported, but it might help.
@ -273,8 +273,8 @@ Target name `turnserver`. Used for unit tests.
[ninja-build-rules]: https://gn.googlesource.com/gn/+/master/docs/reference.md#the-all-and-default-rules
[gn]: https://gn.googlesource.com/gn/+/master/README.md
[gn-doc]: https://gn.googlesource.com/gn/+/master/docs/reference.md#IDE-options
[webrtc-android-development]: https://webrtc.googlesource.com/src/+/refs/heads/master/docs/native-code/android/index.md
[webrtc-ios-development]: https://webrtc.googlesource.com/src/+/refs/heads/master/docs/native-code/ios/index.md
[webrtc-android-development]: https://webrtc.googlesource.com/src/+/main/docs/native-code/android/index.md
[webrtc-ios-development]: https://webrtc.googlesource.com/src/+/main/docs/native-code/ios/index.md
[chromium-work-branches]: https://www.chromium.org/developers/how-tos/get-the-code/working-with-branches
[chromium-work-release-branches]: https://www.chromium.org/developers/how-tos/get-the-code/working-with-release-branches
[webrtc-contributing]: https://webrtc.org/support/contributing/
@ -283,4 +283,4 @@ Target name `turnserver`. Used for unit tests.
[rfc-5766]: https://tools.ietf.org/html/rfc5766
[m80-log]: https://webrtc.googlesource.com/src/+log/branch-heads/3987
[m80]: https://webrtc.googlesource.com/src/+/branch-heads/3987
[fuzzers]: https://chromium.googlesource.com/external/webrtc/+/refs/heads/master/test/fuzzers/
[fuzzers]: https://webrtc.googlesource.com/src/+/main/test/fuzzers/

8
docs/native-code/development/prerequisite-sw/index.md
View File

@ -54,7 +54,7 @@ need to install the NDK/SDK separately.
[depot-tools]: https://commondatastorage.googleapis.com/chrome-infra-docs/flat/depot_tools/docs/html/depot_tools_tutorial.html#_setting_up
[git]: http://git-scm.com
[install-build-deps]: https://cs.chromium.org/chromium/src/build/install-build-deps.sh
[chromium-linux-build-instructions]: https://chromium.googlesource.com/chromium/src/+/master/docs/linux/build_instructions.md
[chromium-win-build-instructions]: https://chromium.googlesource.com/chromium/src/+/master/docs/windows_build_instructions.md
[chromium-linux-prerequisites]: https://chromium.googlesource.com/chromium/src/+/master/docs/linux/build_instructions.md#notes
[chromium-android-build-build-instructions]: https://chromium.googlesource.com/chromium/src/+/master/docs/android_build_instructions.md
[chromium-linux-build-instructions]: https://chromium.googlesource.com/chromium/src/+/main/docs/linux/build_instructions.md
[chromium-win-build-instructions]: https://chromium.googlesource.com/chromium/src/+/main/docs/windows_build_instructions.md
[chromium-linux-prerequisites]: https://chromium.googlesource.com/chromium/src/+/main/docs/linux/build_instructions.md#notes
[chromium-android-build-build-instructions]: https://chromium.googlesource.com/chromium/src/+/main/docs/android_build_instructions.md

12
docs/native-code/index.md
View File

@ -20,7 +20,7 @@ Please read the [License & Rights][webrtc-license] and [FAQ][webrtc-faq]
before downloading the source code.
[webrtc-license]: https://webrtc.org/support/license
[webrtc-faq]: https://webrtc.googlesource.com/src/+/refs/heads/master/docs/faq.md
[webrtc-faq]: https://webrtc.googlesource.com/src/+/main/docs/faq.md
The WebRTC [issue tracker][webrtc-issue-tracker] can be used for submitting
bugs found in native code.
@ -35,8 +35,8 @@ bugs found in native code.
* [iOS][webrtc-ios-development]
* [Experimental RTP header extensions][rtp-hdrext]
[webrtc-prerequitite-sw]: https://webrtc.googlesource.com/src/+/refs/heads/master/docs/native-code/development/prerequisite-sw/index.md
[webrtc-development]: https://webrtc.googlesource.com/src/+/refs/heads/master/docs/native-code/development/index.md
[webtc-android-development]: https://webrtc.googlesource.com/src/+/refs/heads/master/docs/native-code/android/index.md
[webrtc-ios-development]: https://webrtc.googlesource.com/src/+/refs/heads/master/docs/native-code/ios/index.md
[rtp-hdrext]: https://webrtc.googlesource.com/src/+/refs/heads/master/docs/native-code/rtp-hdrext/index.md
[webrtc-prerequitite-sw]: https://webrtc.googlesource.com/src/+/main/docs/native-code/development/prerequisite-sw/index.md
[webrtc-development]: https://webrtc.googlesource.com/src/+/main/docs/native-code/development/index.md
[webtc-android-development]: https://webrtc.googlesource.com/src/+/main/docs/native-code/android/index.md
[webrtc-ios-development]: https://webrtc.googlesource.com/src/+/main/docs/native-code/ios/index.md
[rtp-hdrext]: https://webrtc.googlesource.com/src/+/main/docs/native-code/rtp-hdrext/index.md

6
docs/native-code/ios/index.md
View File

@ -185,9 +185,9 @@ For instructions on how to do this see [here][strip-arch].
[cocoapods]: https://cocoapods.org/pods/GoogleWebRTC
[webrtc-prerequisite-sw]: https://webrtc.googlesource.com/src/+/refs/heads/master/docs/native-code/development/prerequisite-sw/index.md
[webrtc-development]: https://webrtc.googlesource.com/src/+/refs/heads/master/docs/native-code/development/index.md
[framework-script]: https://chromium.googlesource.com/external/webrtc/+/master/tools_webrtc/ios/build_ios_libs.py
[webrtc-prerequisite-sw]: https://webrtc.googlesource.com/src/+/main/docs/native-code/development/prerequisite-sw/index.md
[webrtc-development]: https://webrtc.googlesource.com/src/+/main/docs/native-code/development/index.md
[framework-script]: https://webrtc.googlesource.com/src/+/main/tools_webrtc/ios/build_ios_libs.py
[ninja]: https://ninja-build.org/
[gn]: https://gn.googlesource.com/gn/+/master/README.md
[ios-deploy]: https://github.com/phonegap/ios-deploy