diff --git a/docs/README.md b/docs/README.md index 7a3644230f899f..ffe325ae341a25 100644 --- a/docs/README.md +++ b/docs/README.md @@ -48,6 +48,8 @@ used when committed. (on a Linux host) * [Cast for Android Build Instructions](android_cast_build_instructions.md) - Cast for Android (on a Linux host) +* [Fuchsia Build Instructions](fuchsia_build_instructions.md) - Fuchsia target + (on a Linux host) * [iOS Build Instructions](ios/build_instructions.md) - iOS target (on a MacOS host) * [Chrome OS Build Instructions](chromeos_build_instructions.md) - Chrome OS diff --git a/docs/fuchsia_build_instructions.md b/docs/fuchsia_build_instructions.md index a137bc062e190c..539d0d0a224d10 100644 --- a/docs/fuchsia_build_instructions.md +++ b/docs/fuchsia_build_instructions.md @@ -3,7 +3,7 @@ ***Note that the Fuchsia port is in the early stages, and things are likely to frequently be broken. Try #cr-fuchsia on Freenode if something seems awry.*** -There are instructions for other platforms linked from the +There are instructions for other platforms linked from the [get the code](get_the_code.md) page. ## System requirements @@ -49,9 +49,6 @@ dependencies. $ fetch --nohooks chromium ``` -If you don't want the full repo history, you can save a lot of time by -adding the `--no-history` flag to `fetch`. - Expect the command to take 30 minutes on even a fast connection, and many hours on slower ones. @@ -74,8 +71,14 @@ target_os = ['fuchsia'] Note that this should be added as a top-level statement in the `.gclient` file, not an entry inside the `solutions` dict. -You will then need to re-run `gclient runhooks`. This makes sure the Fuchsia SDK -is available in third\_party and keeps it up to date. +You will then need to run: + +```shell +$ gclient runhooks +``` + +This makes sure the Fuchsia SDK is available in third\_party and keeps it up to +date. The remaining instructions assume you have switched to the `src` directory: @@ -83,6 +86,25 @@ The remaining instructions assume you have switched to the `src` directory: $ cd src ``` +### Update your checkout + +To update an existing checkout, you can run + +```shell +$ git rebase-update +$ 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 +`git pull` or other common Git commands to update the repo. + +The second command syncs dependencies to the appropriate versions and re-runs +hooks as needed. `gclient sync` updates dependencies to the versions specified +in `DEPS`, so any time that file is modified (pulling, changing branches, etc.) +`gclient sync` should be run. + ## (Mac-only) Download additional required Clang binaries Go to [this page](https://chrome-infra-packages.appspot.com/p/fuchsia/clang/mac-amd64/+/) @@ -136,9 +158,3 @@ Common gtest arguments such as `--gtest_filter=...` are supported by the run script. The run script also symbolizes backtraces. - -A useful alias (for "Build And Run Filtered") is: -```shell -alias barf='ninja -C out/fuchsia net_unittests -j1000 && out/fuchsia/bin/run_net_unittests --test-launcher-filter-file=../../testing/buildbot/filters/fuchsia.net_unittests.filter' -``` -to build and run only the tests that are not excluded/known-failing on the bot. diff --git a/docs/get_the_code.md b/docs/get_the_code.md index e4bb6e35747970..a25bce6684c373 100644 --- a/docs/get_the_code.md +++ b/docs/get_the_code.md @@ -12,6 +12,7 @@ you might want to build: * [Android](android_build_instructions.md) * [Android Cast](android_cast_build_instructions.md) * [Chrome OS](chromeos_build_instructions.md) +* [Fuchsia](fuchsia_build_instructions.md) * [iOS](ios/build_instructions.md) * [Linux](linux_build_instructions.md) * [Linux Cast](linux_cast_build_instructions.md)