Update URLs in docs; replace some uses of 'master'
Bug: 1231155 Change-Id: I0634229c0739c97ac0d7530dd58c33771958149a Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3042058 Reviewed-by: Toby Huang <tobyhuang@chromium.org> Commit-Queue: Andrew Williams <awillia@google.com> Cr-Commit-Position: refs/heads/master@{#903745}
This commit is contained in:

committed by
Chromium LUCI CQ

parent
71a469ae71
commit
bbc1a1ee3e
@ -116,7 +116,7 @@ development and testing purposes.
|
||||
## Setting up the build
|
||||
|
||||
Chromium uses [Ninja](https://ninja-build.org) as its main build tool along with
|
||||
a tool called [GN](https://gn.googlesource.com/gn/+/master/docs/quick_start.md)
|
||||
a tool called [GN](https://gn.googlesource.com/gn/+/main/docs/quick_start.md)
|
||||
to generate `.ninja` files. You can create any number of *build directories*
|
||||
with different configurations. To create a build directory which builds Chrome
|
||||
for Android, run `gn args out/Default` and edit the file to contain the
|
||||
@ -135,7 +135,7 @@ target_cpu = "arm64" # See "Figuring out target_cpu" below
|
||||
configuration](https://www.chromium.org/developers/gn-build-configuration).
|
||||
The default will be a debug component build.
|
||||
* For more info on GN, run `gn help` on the command line or read the
|
||||
[quick start guide](https://gn.googlesource.com/gn/+/master/docs/quick_start.md).
|
||||
[quick start guide](https://gn.googlesource.com/gn/+/main/docs/quick_start.md).
|
||||
|
||||
Also be aware that some scripts (e.g. `tombstones.py`, `adb_gdb.py`)
|
||||
require you to set `CHROMIUM_OUTPUT_DIR=out/Default`.
|
||||
@ -143,7 +143,7 @@ require you to set `CHROMIUM_OUTPUT_DIR=out/Default`.
|
||||
### Figuring out target\_cpu
|
||||
|
||||
The value of
|
||||
[`target_cpu`](https://gn.googlesource.com/gn/+/master/docs/reference.md#target_cpu)
|
||||
[`target_cpu`](https://gn.googlesource.com/gn/+/main/docs/reference.md#var_target_cpu)
|
||||
determines what instruction set to use for native code. Given a device (or
|
||||
emulator), you can determine the correct instruction set with `adb shell getprop
|
||||
ro.product.cpu.abi`:
|
||||
@ -223,7 +223,7 @@ $ gclient sync
|
||||
|
||||
The first command updates the primary Chromium source repository and rebases
|
||||
any of your local branches on top of tip-of-tree (aka the Git branch
|
||||
`origin/master`). If you don't want to use this script, you can also just use
|
||||
`origin/main`). If you don't want to use this script, you can also just use
|
||||
`git pull` or other common Git commands to update the repo.
|
||||
|
||||
The second command syncs dependencies to the appropriate versions and re-runs
|
||||
|
@ -116,7 +116,7 @@ development and testing purposes.
|
||||
## Setting up the build
|
||||
|
||||
Chromium uses [Ninja](https://ninja-build.org) as its main build tool along with
|
||||
a tool called [GN](https://gn.googlesource.com/gn/+/master/docs/quick_start.md)
|
||||
a tool called [GN](https://gn.googlesource.com/gn/+/main/docs/quick_start.md)
|
||||
to generate `.ninja` files. You can create any number of *build directories*
|
||||
with different configurations. To create a build directory which builds Chrome
|
||||
for Android, run:
|
||||
@ -134,7 +134,7 @@ $ gn gen --args='target_os="android" is_chromecast=true' out/Default
|
||||
The default will be a debug component build matching the current host
|
||||
operating system and CPU.
|
||||
* For more info on GN, run `gn help` on the command line or read the
|
||||
[quick start guide](https://gn.googlesource.com/gn/+/master/docs/quick_start.md).
|
||||
[quick start guide](https://gn.googlesource.com/gn/+/main/docs/quick_start.md).
|
||||
|
||||
Also be aware that some scripts (e.g. `tombstones.py`, `adb_gdb.py`)
|
||||
require you to set `CHROMIUM_OUTPUT_DIR=out/Default`.
|
||||
|
@ -21,7 +21,7 @@ before continuing by setting the environment variable `DEPOT_TOOLS_UPDATE=0`.
|
||||
~/chrome/src $ COMMIT_DATE=$(git log -n 1 --pretty=format:%ci)
|
||||
|
||||
# Check out depot_tools revision from the same time:
|
||||
~/depot_tools $ git checkout $(git rev-list -n 1 --before="$COMMIT_DATE" master)
|
||||
~/depot_tools $ git checkout $(git rev-list -n 1 --before="$COMMIT_DATE" main)
|
||||
~/depot_tools $ export DEPOT_TOOLS_UPDATE=0
|
||||
```
|
||||
|
||||
@ -83,7 +83,7 @@ You may also need to disable goma (if enabled).
|
||||
When returning to a normal checkout, you may need to undo some of the changes
|
||||
above:
|
||||
|
||||
* Restore `depot_tools` to the `master` branch.
|
||||
* Restore `depot_tools` to the `main` branch.
|
||||
* Clean up any `_bad_scm/` directories in the directory containing `.gclient`.
|
||||
* Revert your `.gclient` file if `gclient` changed it:
|
||||
|
||||
|
@ -2,7 +2,7 @@
|
||||
|
||||
## Introduction
|
||||
|
||||
[clangd](https://clang.llvm.org/extra/clangd/) is a clang-based [language server](http://langserver.org/).
|
||||
[clangd](https://clangd.llvm.org/) is a clang-based [language server](https://langserver.org/).
|
||||
It brings IDE features (e.g. diagnostics, code completion, code navigations) to
|
||||
your editor.
|
||||
|
||||
@ -21,7 +21,7 @@ tools/clang/scripts/generate_compdb.py -p out/<build> > compile_commands.json
|
||||
|
||||
## Getting clangd
|
||||
|
||||
See [instructions](https://clang.llvm.org/extra/clangd/Installation.html#installing-clangd).
|
||||
See [instructions](https://clangd.llvm.org/installation.html#installing-clangd).
|
||||
|
||||
**Googlers:** clangd has been installed on your glinux by default, just use
|
||||
`/usr/bin/clangd`.
|
||||
@ -76,7 +76,7 @@ ninja -C out/Release chrome
|
||||
```
|
||||
|
||||
4. Use clangd in your favourite editor, see detailed [instructions](
|
||||
https://clang.llvm.org/extra/clangd/Installation.html#getting-started-with-clangd).
|
||||
https://clangd.llvm.org/installation.html#editor-plugins).
|
||||
|
||||
## Background Indexing
|
||||
|
||||
|
@ -20,7 +20,7 @@ power figuring out the next step to take.
|
||||
You should create a new branch before starting any development work. It's
|
||||
helpful to branch early and to branch often in Git. Use the command
|
||||
`git new-branch <branch_name>`. This is equivalent to
|
||||
`git checkout -b <branch_name> --track origin/master`.
|
||||
`git checkout -b <branch_name> --track origin/main`.
|
||||
|
||||
You may also want to set another local branch as the upstream branch. You can do
|
||||
that with `git checkout -b <branch_name> --track <upstream_branch>`. Do this if
|
||||
@ -126,7 +126,7 @@ shortcut for combining the previous step and this one is `git commit -a -m
|
||||
If you have many commits on your current branch, and you want to avoid some
|
||||
nasty commit-by-commit merge conflicts in the next step, consider collecting all
|
||||
your changes into one commit. Run `git rebase -i @{u}`. The `@{u}` is a
|
||||
short-hand pointer for the upstream branch, which is usually origin/master, but
|
||||
short-hand pointer for the upstream branch, which is usually origin/main, but
|
||||
can also be one of your local branches. After running the `git rebase` command,
|
||||
you should see a list of commits, with each commit starting with the word
|
||||
"pick". Make sure the first commit says "pick" and change the rest from "pick"
|
||||
|
@ -126,7 +126,7 @@ $ gclient sync
|
||||
|
||||
The first command updates the primary Chromium source repository and rebases
|
||||
any of your local branches on top of tip-of-tree (aka the Git branch
|
||||
`origin/master`). If you don't want to use this script, you can also just use
|
||||
`origin/main`). If you don't want to use this script, you can also just use
|
||||
`git pull` or other common Git commands to update the repo.
|
||||
|
||||
The second command syncs dependencies to the appropriate versions and re-runs
|
||||
@ -147,7 +147,7 @@ $ unzip /path/to/clang.zip bin/llvm-ar -d ${CHROMIUM_SRC}/third_party/llvm-build
|
||||
## Setting up the build
|
||||
|
||||
Chromium uses [Ninja](https://ninja-build.org) as its main build tool along with
|
||||
a tool called [GN](https://gn.googlesource.com/gn/+/master/docs/quick_start.md)
|
||||
a tool called [GN](https://gn.googlesource.com/gn/+/main/docs/quick_start.md)
|
||||
to generate `.ninja` files. You can create any number of *build directories*
|
||||
with different configurations. To create a build directory, run:
|
||||
|
||||
|
@ -60,7 +60,7 @@ an old version of a CL.
|
||||
```bash
|
||||
#!/bin/bash
|
||||
# Commit all, amending if not initial commit.
|
||||
if git status | grep -q "# Your branch is ahead of 'master' by 1 commit."
|
||||
if git status | grep -q "Your branch is ahead of 'origin/main' by 1 commit."
|
||||
then
|
||||
git commit --all --amend
|
||||
else
|
||||
|
@ -355,10 +355,10 @@ Example usage:
|
||||
If, for some reason, the local run code is unable to determine what the git
|
||||
revision is, simply pass `--git-revision aabbccdd`. Note that `aabbccdd` must
|
||||
be replaced with an actual Chromium src revision (typically whatever revision
|
||||
origin/master is currently synced to) in order for the tests to work. This can
|
||||
origin/main is currently synced to) in order for the tests to work. This can
|
||||
be done automatically using:
|
||||
``run_gpu_integration_test.py pixel --no-skia-gold-failure --local-pixel-tests
|
||||
--passthrough --git-revision `git rev-parse origin/master` ``
|
||||
--passthrough --git-revision `git rev-parse origin/main` ``
|
||||
|
||||
## Running Binaries from the Bots Locally
|
||||
|
||||
|
@ -318,7 +318,7 @@ $ gclient sync
|
||||
|
||||
The first command updates the primary Chromium source repository and rebases
|
||||
any of your local branches on top of tip-of-tree (aka the Git branch
|
||||
`origin/master`). If you don't want to use this script, you can also just use
|
||||
`origin/main`). If you don't want to use this script, you can also just use
|
||||
`git pull` or other common Git commands to update the repo.
|
||||
|
||||
The second command syncs dependencies to the appropriate versions and re-runs
|
||||
|
@ -111,7 +111,7 @@ development and testing purposes.
|
||||
## Setting up the build
|
||||
|
||||
Chromium uses [Ninja](https://ninja-build.org) as its main build tool along with
|
||||
a tool called [GN](https://gn.googlesource.com/gn/+/master/docs/quick_start.md)
|
||||
a tool called [GN](https://gn.googlesource.com/gn/+/main/docs/quick_start.md)
|
||||
to generate `.ninja` files. You can create any number of *build directories*
|
||||
with different configurations. To create a build directory, run:
|
||||
|
||||
@ -128,7 +128,7 @@ $ gn gen out/Default
|
||||
The default will be a debug component build matching the current host
|
||||
operating system and CPU.
|
||||
* For more info on GN, run `gn help` on the command line or read the
|
||||
[quick start guide](https://gn.googlesource.com/gn/+/master/docs/quick_start.md).
|
||||
[quick start guide](https://gn.googlesource.com/gn/+/main/docs/quick_start.md).
|
||||
|
||||
### <a name="faster-builds"></a>Faster builds
|
||||
|
||||
@ -288,7 +288,7 @@ $ gclient sync
|
||||
|
||||
The first command updates the primary Chromium source repository and rebases
|
||||
any of your local branches on top of tip-of-tree (aka the Git branch
|
||||
`origin/master`). If you don't want to use this script, you can also just use
|
||||
`origin/main`). If you don't want to use this script, you can also just use
|
||||
`git pull` or other common Git commands to update the repo.
|
||||
|
||||
The second command syncs dependencies to the appropriate versions and re-runs
|
||||
|
@ -99,7 +99,7 @@ development and testing purposes.
|
||||
## Setting up the build
|
||||
|
||||
Chromium uses [Ninja](https://ninja-build.org) as its main build tool along with
|
||||
a tool called [GN](https://gn.googlesource.com/gn/+/master/docs/quick_start.md)
|
||||
a tool called [GN](https://gn.googlesource.com/gn/+/main/docs/quick_start.md)
|
||||
to generate `.ninja` files. You can create any number of *build directories*
|
||||
with different configurations. To create a build directory, run:
|
||||
|
||||
@ -116,7 +116,7 @@ $ gn gen out/Default --args='is_chromecast=true'
|
||||
The default will be a debug component build matching the current host
|
||||
operating system and CPU.
|
||||
* For more info on GN, run `gn help` on the command line or read the
|
||||
[quick start guide](https://gn.googlesource.com/gn/+/master/docs/quick_start.md).
|
||||
[quick start guide](https://gn.googlesource.com/gn/+/main/docs/quick_start.md).
|
||||
|
||||
### <a name="faster-builds"></a>Faster builds
|
||||
|
||||
@ -153,7 +153,7 @@ $ gclient sync
|
||||
|
||||
The first command updates the primary Chromium source repository and rebases
|
||||
any of your local branches on top of tip-of-tree (aka the Git branch
|
||||
`origin/master`). If you don't want to use this script, you can also just use
|
||||
`origin/main`). If you don't want to use this script, you can also just use
|
||||
`git pull` or other common Git commands to update the repo.
|
||||
|
||||
The second command syncs dependencies to the appropriate versions and re-runs
|
||||
|
@ -95,7 +95,7 @@ development and testing purposes.
|
||||
## Setting up the build
|
||||
|
||||
Chromium uses [Ninja](https://ninja-build.org) as its main build tool along with
|
||||
a tool called [GN](https://gn.googlesource.com/gn/+/master/docs/quick_start.md)
|
||||
a tool called [GN](https://gn.googlesource.com/gn/+/main/docs/quick_start.md)
|
||||
to generate `.ninja` files. You can create any number of *build directories*
|
||||
with different configurations. To create a build directory:
|
||||
|
||||
@ -112,7 +112,7 @@ $ gn gen out/Default
|
||||
The default will be a debug component build matching the current host
|
||||
operating system and CPU.
|
||||
* For more info on GN, run `gn help` on the command line or read the
|
||||
[quick start guide](https://gn.googlesource.com/gn/+/master/docs/quick_start.md).
|
||||
[quick start guide](https://gn.googlesource.com/gn/+/main/docs/quick_start.md).
|
||||
* Building Chromium for arm Macs requires [additional setup](mac_arm64.md).
|
||||
|
||||
|
||||
@ -213,7 +213,7 @@ $ gclient sync
|
||||
|
||||
The first command updates the primary Chromium source repository and rebases
|
||||
any of your local branches on top of tip-of-tree (aka the Git branch
|
||||
`origin/master`). If you don't want to use this script, you can also just use
|
||||
`origin/main`). If you don't want to use this script, you can also just use
|
||||
`git pull` or other common Git commands to update the repo.
|
||||
|
||||
The second command syncs dependencies to the appropriate versions and re-runs
|
||||
|
@ -48,7 +48,7 @@ been implemented as such ever since.
|
||||
This change is being incorporated into the Chrome-specific UI code and will not
|
||||
affect embedders that are based solely on the underlying content layer.
|
||||
Embedders that incorporate the Chrome-specific code will either take up these
|
||||
changes or maintain a diff from the master Chromium branch.
|
||||
changes or maintain a diff from the `main` Chromium branch.
|
||||
|
||||
|
||||
## Further Reading
|
||||
|
@ -11,7 +11,7 @@ On all platforms, build the target `blink_tests`.
|
||||
|
||||
*** note
|
||||
**Mac:** Add `enable_dsyms = 1` to your [gn build
|
||||
arguments](https://gn.googlesource.com/gn/+/master/docs/quick_start.md) before
|
||||
arguments](https://gn.googlesource.com/gn/+/main/docs/quick_start.md) before
|
||||
building. This slows down linking several minutes, so don't just always set it
|
||||
by default.
|
||||
***
|
||||
|
@ -167,7 +167,7 @@ development and testing purposes.
|
||||
## Setting up the build
|
||||
|
||||
Chromium uses [Ninja](https://ninja-build.org) as its main build tool along with
|
||||
a tool called [GN](https://gn.googlesource.com/gn/+/master/docs/quick_start.md)
|
||||
a tool called [GN](https://gn.googlesource.com/gn/+/main/docs/quick_start.md)
|
||||
to generate `.ninja` files. You can create any number of *build directories*
|
||||
with different configurations. To create a build directory:
|
||||
|
||||
@ -185,7 +185,7 @@ $ gn gen out/Default
|
||||
The default will be a debug component build matching the current host
|
||||
operating system and CPU.
|
||||
* For more info on GN, run `gn help` on the command line or read the [quick
|
||||
start guide](https://gn.googlesource.com/gn/+/master/docs/quick_start.md).
|
||||
start guide](https://gn.googlesource.com/gn/+/main/docs/quick_start.md).
|
||||
|
||||
### Faster builds
|
||||
|
||||
@ -387,9 +387,9 @@ $ gclient sync -D
|
||||
```
|
||||
|
||||
The first command updates the primary Chromium source repository and rebases
|
||||
any of your local branches on top of tip-of-tree (aka the Git branch `origin/master`).
|
||||
If you don't want to use this script, you can also just use `git pull` or
|
||||
other common Git commands to update the repo.
|
||||
any of your local branches on top of tip-of-tree (aka the Git branch
|
||||
`origin/main`). If you don't want to use this script, you can also just use
|
||||
`git pull` or other common Git commands to update the repo.
|
||||
|
||||
The second command syncs the subrepositories to the appropriate versions,
|
||||
deleting those that are no longer needed, and re-runs the hooks as needed.
|
||||
|
Reference in New Issue
Block a user