Update doc references to ninja to also mention autoninja.
Change-Id: Ib45d3f86a0b68f6d0b10847cf7e3859b640e34a3
Reviewed-on: https://chromium-review.googlesource.com/c/1292403
Commit-Queue: Dirk Pranke <[email protected]>
Reviewed-by: Bruce Dawson <[email protected]>
Cr-Commit-Position: refs/heads/master@{#602453}diff --git a/docs/android_build_instructions.md b/docs/android_build_instructions.md
index 88ba48c4..58017d54 100644
--- a/docs/android_build_instructions.md
+++ b/docs/android_build_instructions.md
@@ -147,13 +147,12 @@
autoninja -C out/Default chrome_public_apk
```
-`autoninja` is a wrapper that automatically provides optimal values for the
-arguments passed to `ninja`.
-
+(`autoninja` is a wrapper that automatically provides optimal values for the
+arguments passed to `ninja`.)
You can get a list of all of the other build targets from GN by running `gn ls
out/Default` from the command line. To compile one, pass the GN label to Ninja
-with no preceding "//" (so, for `//chrome/test:unit_tests` use `ninja -C
+with no preceding "//" (so, for `//chrome/test:unit_tests` use `autoninja -C
out/Default chrome/test:unit_tests`).
### Multiple Chrome APK Targets
diff --git a/docs/android_cast_build_instructions.md b/docs/android_cast_build_instructions.md
index 9628d04..4e4b693 100644
--- a/docs/android_cast_build_instructions.md
+++ b/docs/android_cast_build_instructions.md
@@ -144,9 +144,12 @@
Build `cast_shell_apk` with Ninja using the command:
```shell
-$ ninja -C out/Default cast_shell_apk
+$ autoninja -C out/Default cast_shell_apk
```
+(`autoninja` is a wrapper that automatically provides optimal values for the
+arguments passed to `ninja`.)
+
## Installing and Running `cast_shell_apk` on a device
### Plug in your Android device
@@ -176,7 +179,7 @@
### Build the APK
```shell
-ninja -C out/Release cast_shell_apk
+autoninja -C out/Release cast_shell_apk
```
And deploy it to your Android device:
diff --git a/docs/chromeos_build_instructions.md b/docs/chromeos_build_instructions.md
index 852fc254..164f5de 100644
--- a/docs/chromeos_build_instructions.md
+++ b/docs/chromeos_build_instructions.md
@@ -42,6 +42,9 @@
$ autoninja -C out/Default chrome
$ out/Default/chrome
+(`autoninja` is a wrapper that automatically provides optimal values for the
+arguments passed to `ninja`).
+
Some additional options you may wish to set by passing in `--args` to `gn gen`
or running `gn args out/Default`:
diff --git a/docs/fuchsia_build_instructions.md b/docs/fuchsia_build_instructions.md
index 539d0d0a..f43cc9e 100644
--- a/docs/fuchsia_build_instructions.md
+++ b/docs/fuchsia_build_instructions.md
@@ -140,8 +140,8 @@
$ autoninja -C out/fuchsia base_unittests
```
-`autoninja` is a wrapper that automatically provides optimal values for the
-arguments passed to `ninja`.
+(`autoninja` is a wrapper that automatically provides optimal values for the
+arguments passed to `ninja`.)
## Run
diff --git a/docs/ios/build_instructions.md b/docs/ios/build_instructions.md
index 8d5788b..547a6b5e 100644
--- a/docs/ios/build_instructions.md
+++ b/docs/ios/build_instructions.md
@@ -81,13 +81,16 @@
available configuration options.
From this point, you can either build from Xcode or from the command line using
-`ninja`. `setup-gn.py` creates sub-directories named
+`autoninja`. `setup-gn.py` creates sub-directories named
`out/${configuration}-${platform}`, so for a `Debug` build for simulator use:
```shell
-$ ninja -C out/Debug-iphonesimulator gn_all
+$ autoninja -C out/Debug-iphonesimulator gn_all
```
+(`autoninja` is a wrapper that automatically provides optimal values for the
+arguments passed to `ninja`.)
+
Note: you need to run `setup-gn.py` script every time one of the `BUILD.gn`
file is updated (either by you or after rebasing). If you forget to run it,
the list of targets and files in the Xcode solution may be stale.
@@ -191,7 +194,7 @@
be signed on the command line, e.g.:
```shell
-$ ninja -C out/Debug-iphoneos ios_web_shell
+$ autoninja -C out/Debug-iphoneos ios_web_shell
ninja: Entering directory `out/Debug-iphoneos'
FAILED: ios_web_shell.app/ios_web_shell ios_web_shell.app/_CodeSignature/CodeResources ios_web_shell.app/embedded.mobileprovision
python ../../build/config/ios/codesign.py code-sign-bundle -t=iphoneos -i=0123456789ABCDEF0123456789ABCDEF01234567 -e=../../build/config/ios/entitlements.plist -b=obj/ios/web/shell/ios_web_shell ios_web_shell.app
diff --git a/docs/linux_build_instructions.md b/docs/linux_build_instructions.md
index 1d5048c..444c9ffe 100644
--- a/docs/linux_build_instructions.md
+++ b/docs/linux_build_instructions.md
@@ -242,8 +242,8 @@
$ autoninja -C out/Default chrome
```
-`autoninja` is a wrapper that automatically provides optimal values for the
-arguments passed to `ninja`.
+(`autoninja` is a wrapper that automatically provides optimal values for the
+arguments passed to `ninja`.)
You can get a list of all of the other build targets from GN by running `gn ls
out/Default` from the command line. To compile one, pass the GN label to Ninja
diff --git a/docs/linux_build_instructions_prerequisites.md b/docs/linux_build_instructions_prerequisites.md
deleted file mode 100644
index 0d84aa2..0000000
--- a/docs/linux_build_instructions_prerequisites.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# Linux Build Instructions Prerequisites
-
-The contents of this page have been folded into the
-[Linux build instructions](linux_build_instructions.md).
-
-This file will be deleted in the future, please update your links.
-
diff --git a/docs/linux_cast_build_instructions.md b/docs/linux_cast_build_instructions.md
index 7f09038..12bc16b 100644
--- a/docs/linux_cast_build_instructions.md
+++ b/docs/linux_cast_build_instructions.md
@@ -128,9 +128,12 @@
Build cast\_shell with Ninja using the command:
```shell
-$ ninja -C out/Default cast_shell
+$ autoninja -C out/Default cast_shell
```
+(`autoninja` is a wrapper that automatically provides optimal values for the
+arguments passed to `ninja`.)
+
## Run cast\_shell
Once it is built, you can simply run it:
diff --git a/docs/mac_build_instructions.md b/docs/mac_build_instructions.md
index 718bc69..a8b40df2 100644
--- a/docs/mac_build_instructions.md
+++ b/docs/mac_build_instructions.md
@@ -160,8 +160,8 @@
$ autoninja -C out/Default chrome
```
-`autoninja` is a wrapper that automatically provides optimal values for the
-arguments passed to `ninja`.
+(`autoninja` is a wrapper that automatically provides optimal values for the
+arguments passed to `ninja`.)
You can get a list of all of the other build targets from GN by running `gn ls
out/Default` from the command line. To compile one, pass the GN label to Ninja
@@ -233,7 +233,7 @@
build in the Terminal and write code with a text editor, though.
With hybrid builds, compilation is still handled by Ninja, and can be run from
-the command line (e.g. `ninja -C out/gn chrome`) or by choosing the `chrome`
+the command line (e.g. `autoninja -C out/gn chrome`) or by choosing the `chrome`
target in the hybrid workspace and choosing Build.
To use Xcode-Ninja Hybrid pass `--ide=xcode` to `gn gen`:
diff --git a/docs/old_chromoting_build_instructions.md b/docs/old_chromoting_build_instructions.md
index f3a4fbc..841288a 100644
--- a/docs/old_chromoting_build_instructions.md
+++ b/docs/old_chromoting_build_instructions.md
@@ -54,10 +54,13 @@
1. Build the Chromoting host binaries:
```shell
- $ ninja -C out/Release remoting_me2me_host remoting_start_host \
+ $ autoninja -C out/Release remoting_me2me_host remoting_start_host \
remoting_native_messaging_host remoting_native_messaging_manifests
```
+ (`autoninja` is a wrapper that automatically provides optimal values for the
+ arguments passed to `ninja`.)
+
1. When the build finishes, move into the installer directory:
`$ cd remoting/host/installer/`
1. Generate a DEB package for your system's package manager:
@@ -89,7 +92,7 @@
```shell
$ GOOGLE_CLIENT_ID_REMOTING_IDENTITY_API=<client id> \
- ninja -C out/Release remoting_webapp
+ autoninja -C out/Release remoting_webapp
```
1. Install the extension into your Chromium (or Chrome) browser:
@@ -114,7 +117,7 @@
https://www.chromium.org/developers/how-tos/android-build-instructions
1. Move into the `src/` directory that contains your checkout of the Chromium
code.
-1. Build the Android app: `$ ninja -C out/Release remoting_apk`
+1. Build the Android app: `$ autoninja -C out/Release remoting_apk`
1. Connect your device and set up USB debugging:
1. Plug your device in via USB.
1. Open the Settings app and look for the `Developer options` choice.
