Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(189)

Unified Diff: mojo/tools/mopy/gn.py

Issue 1124763003: Update from https://crrev.com/327068 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: update nacl, buildtools, fix display_change_notifier_unittest Created 5 years, 7 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:
View side-by-side diff with in-line comments
Download patch
Index: mojo/tools/mopy/gn.py
diff --git a/mojo/tools/mopy/gn.py b/mojo/tools/mopy/gn.py
index f17128137626fd9b90b0118ba73724cb7290face..1e519dace4a49fa0d0a8fc1e9c932dccd0baaa51 100644
--- a/mojo/tools/mopy/gn.py
+++ b/mojo/tools/mopy/gn.py
@@ -65,9 +65,9 @@ def GNArgsForConfig(config):
gn_args["go_build_tool"] = config.values.get("go_build_tool")
if config.target_os == Config.OS_ANDROID:
- gn_args["os"] = "android"
+ gn_args["target_os"] = "android"
elif config.target_os == Config.OS_CHROMEOS:
- gn_args["os"] = "chromeos"
+ gn_args["target_os"] = "chromeos"
gn_args["use_glib"] = False
gn_args["use_system_harfbuzz"] = False
elif config.target_os == Config.OS_LINUX:
@@ -114,7 +114,7 @@ def ConfigForGNArgs(args):
config_args["mojo_use_go"] = args.get("mojo_use_go", False)
if config_args["mojo_use_go"]:
config_args["go_build_tool"] = args.get("go_build_tool")
- config_args["target_os"] = args.get("os")
+ config_args["target_os"] = args.get("target_os")
config_args["target_cpu"] = args.get("target_cpu")
config_args["dcheck_always_on"] = args.get("dcheck_always_on")
return Config(**config_args)

Powered by Google App Engine
This is Rietveld 408576698