diff options
| author | jsbell@chromium.org <jsbell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-02 00:12:02 +0000 |
|---|---|---|
| committer | jsbell@chromium.org <jsbell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-02 00:12:02 +0000 |
| commit | 91dc790ab7c7d2f287c24947c7eaca2d0f6217ba (patch) | |
| tree | 46d5ab19fcbf67317b607b079a7358799fb55a78 /tools/gn/args.cc | |
| parent | f635e0b4eb22336ede68f0a34b967bd4ef819512 (diff) | |
| download | chromium_src-91dc790ab7c7d2f287c24947c7eaca2d0f6217ba.zip chromium_src-91dc790ab7c7d2f287c24947c7eaca2d0f6217ba.tar.gz chromium_src-91dc790ab7c7d2f287c24947c7eaca2d0f6217ba.tar.bz2 | |
Revert 267672 "Remove URL from base's DEPS"
Only base/DEPS file was part of the CL and should have changed.
It looks like a manual commit brought in the rest, causing build
failures. Reverting the whole thing for now.
> Remove URL from base's DEPS
>
> +url is added at the root, and we don't want base to depend on it. Remove this rule explicitly in base to prevent regressions.
>
> R=viettrungluu@chromium.org
>
> Review URL: https://codereview.chromium.org/262773006
TBR=brettw@chromium.org
Review URL: https://codereview.chromium.org/265893005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@267687 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools/gn/args.cc')
| -rw-r--r-- | tools/gn/args.cc | 29 |
1 files changed, 8 insertions, 21 deletions
diff --git a/tools/gn/args.cc b/tools/gn/args.cc index daa902ec..2c4891c 100644 --- a/tools/gn/args.cc +++ b/tools/gn/args.cc @@ -26,33 +26,20 @@ const char kBuildArgs_Help[] = " - default_os\n" " - os (by default this is the same as \"default_os\")\n" "\n" - " If specified, arguments from the --args command line flag are used. If\n" - " that flag is not specified, args from previous builds in the build\n" - " directory will be used (this is in the file gn.args in the build\n" - " directory).\n" + " Second, arguments specified on the command-line via \"--args\" are\n" + " applied. These can override the system default ones, and add new ones.\n" + " These are whitespace-separated. For example:\n" "\n" - " Last, for targets being compiled with a non-default toolchain, the\n" - " toolchain overrides are applied. These are specified in the\n" + " gn --args=\"enable_doom_melon=false\" os=\\\"beos\\\"\n" + "\n" + " Third, toolchain overrides are applied. These are specified in the\n" " toolchain_args section of a toolchain definition. The use-case for\n" " this is that a toolchain may be building code for a different\n" " platform, and that it may want to always specify Posix, for example.\n" " See \"gn help toolchain_args\" for more.\n" "\n" - " If you specify an override for a build argument that never appears in\n" - " a \"declare_args\" call, a nonfatal error will be displayed.\n" - "\n" - "Examples\n" - "\n" - " gn args out/FooBar\n" - " Create the directory out/FooBar and open an editor. You would type\n" - " something like this into that file:\n" - " enable_doom_melon=false\n" - " os=\"android\"\n" - "\n" - " gn gen out/FooBar --args=\"enable_doom_melon=true os=\\\"android\\\"\"\n" - " This will overwrite the build directory with the given arguments.\n" - " (Note that the quotes inside the args command will usually need to\n" - " be escaped for your shell to pass through strings values.)\n" + " It is an error to specify an override for a build argument that never\n" + " appears in a \"declare_args\" call.\n" "\n" "How build arguments are used\n" "\n" |