tools/gn/command_args.cc - Issue 137713007: Check for GN args using the union of all rather than individually.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: tools/gn/command_args.cc

Issue 137713007: Check for GN args using the union of all rather than individually. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: tools/gn/command_args.cc

diff --git a/tools/gn/command_args.cc b/tools/gn/command_args.cc

index ad1a59699d00aa6fddb14f786f90ab4da5ae3d1a..dd28c11839efdb7a3101892fcf834f3857fe0041 100644

--- a/tools/gn/command_args.cc

+++ b/tools/gn/command_args.cc

@@ -123,8 +123,8 @@ int RunArgs(const std::vector<std::string>& args) {

if (!setup->DoSetup() || !setup->Run())

return 1;

- const Scope::KeyValueMap& build_args =

- setup->build_settings().build_args().declared_arguments();

+ Scope::KeyValueMap build_args;

+ setup->build_settings().build_args().MergeDeclaredArguments(&build_args);

if (args.size() == 1) {

// Get help on a specific command.

« no previous file with comments | « tools/gn/args.cc ('k') | tools/gn/command_gyp.cc » ('j') | no next file with comments »