Replace instances of datadeps --> data_deps.
The latter is the canonical name, however both are supported.
TBR=xhwang@chromium.org, mkwst@chromium.org
Review URL: https://codereview.chromium.org/1335313003
Cr-Original-Commit-Position: refs/heads/master@{#348825}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 3cb0032bded7ce5127f489593928b830bfe8f29b
diff --git a/tools/gn/command_format.cc b/tools/gn/command_format.cc
index 81424ab..5eff601 100644
--- a/tools/gn/command_format.cc
+++ b/tools/gn/command_format.cc
@@ -299,9 +299,9 @@
// things, but not flags things.
if (binop->op().value() == "=" && ident && list) {
const base::StringPiece lhs = ident->value().value();
- if (lhs == "data" || lhs == "datadeps" || lhs == "deps" ||
- lhs == "inputs" || lhs == "outputs" || lhs == "public" ||
- lhs == "public_deps" || lhs == "sources") {
+ if (lhs == "data" || lhs == "datadeps" || lhs == "data_deps" ||
+ lhs == "deps" || lhs == "inputs" || lhs == "outputs" ||
+ lhs == "public" || lhs == "public_deps" || lhs == "sources") {
const_cast<ListNode*>(list)->set_prefer_multiline(true);
}
}
diff --git a/tools/gn/docs/language.md b/tools/gn/docs/language.md
index 080fe49..35ef4ae 100644
--- a/tools/gn/docs/language.md
+++ b/tools/gn/docs/language.md
@@ -517,7 +517,7 @@
```
If a 64-bit target wants to depend on a 32-bit binary, it would specify
-a dependency using `datadeps` (data deps are like deps that are only
+a dependency using `data_deps` (data deps are like deps that are only
needed at runtime and aren't linked, since you can't link a 32-bit and a
64-bit library).
@@ -526,7 +526,7 @@
...
if (target_cpu == "x64") {
# The 64-bit build needs this 32-bit helper.
- datadeps = [ ":helper(//toolchains:32)" ]
+ data_deps = [ ":helper(//toolchains:32)" ]
}
}
diff --git a/tools/gn/docs/reference.md b/tools/gn/docs/reference.md
index 8e4970d..8cd25ab 100644
--- a/tools/gn/docs/reference.md
+++ b/tools/gn/docs/reference.md
@@ -3518,7 +3518,7 @@
A list of target labels.
Specifies dependencies of a target that are not actually linked into
- the current target. Such dependencies will built and will be available
+ the current target. Such dependencies will be built and will be available
at runtime.
This is normally used for things like plugins or helper programs that
diff --git a/tools/gn/variables.cc b/tools/gn/variables.cc
index 83b2957..d068fd8 100644
--- a/tools/gn/variables.cc
+++ b/tools/gn/variables.cc
@@ -563,8 +563,8 @@
" A list of target labels.\n"
"\n"
" Specifies dependencies of a target that are not actually linked into\n"
- " the current target. Such dependencies will built and will be available\n"
- " at runtime.\n"
+ " the current target. Such dependencies will be built and will be\n"
+ " available at runtime.\n"
"\n"
" This is normally used for things like plugins or helper programs that\n"
" a target needs at runtime.\n"
