summaryrefslogtreecommitdiffstats
path: root/tools/gn/variables.cc
diff options
context:
space:
mode:
authorBrett Wilson <brettw@chromium.org>2014-09-17 12:00:23 -0700
committerBrett Wilson <brettw@chromium.org>2014-09-17 19:01:13 +0000
commitc4a325a6cef25f7380b9c7cca9178b85849077ae (patch)
tree060fe9475ef62f3ac51085f911f96e1e2d5a7376 /tools/gn/variables.cc
parent17e5a85d71ba5ca09fe66ac4c1b0e4e7262db9bd (diff)
downloadchromium_src-c4a325a6cef25f7380b9c7cca9178b85849077ae.zip
chromium_src-c4a325a6cef25f7380b9c7cca9178b85849077ae.tar.gz
chromium_src-c4a325a6cef25f7380b9c7cca9178b85849077ae.tar.bz2
GN fixes for group dependent configs.
Adds a better tests for pulling dependent and public configs. These don't actually test the bug, but are important. The bug was removing the group conditional when pulling dependent configs. Previously the groups deps would get duplicated so we wouldn't want to pull a group's public deps. I didn't write a test for this since it seemed odd to test that there is not a special case for this. I just removed the condition. Fixes a misspelliung and and an extra newline in the help. BUG= R=jamesr@chromium.org Review URL: https://codereview.chromium.org/581723002 Cr-Commit-Position: refs/heads/master@{#295314}
Diffstat (limited to 'tools/gn/variables.cc')
-rw-r--r--tools/gn/variables.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/gn/variables.cc b/tools/gn/variables.cc
index 6cd8534..75172ec 100644
--- a/tools/gn/variables.cc
+++ b/tools/gn/variables.cc
@@ -370,7 +370,7 @@ const char kCheckIncludes_Help[] =
const char kCompleteStaticLib[] = "complete_static_lib";
const char kCompleteStaticLib_HelpShort[] =
- "complete_static_lib: [boolean] Links all deps into a static library.\n";
+ "complete_static_lib: [boolean] Links all deps into a static library.";
const char kCompleteStaticLib_Help[] =
"complete_static_lib: [boolean] Links all deps into a static library.\n"
"\n"
@@ -813,7 +813,7 @@ const char kPublicConfigs_Help[] =
const char kPublicDeps[] = "public_deps";
const char kPublicDeps_HelpShort[] =
- "public: [label list] Declare public dependencies.";
+ "public_deps: [label list] Declare public dependencies.";
const char kPublicDeps_Help[] =
"public_deps: Declare public dependencies.\n"
"\n"