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

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

Issue 1348493002: Add fnl build target (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: rebased Created 5 years, 3 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
« no previous file with comments | « mojo/tools/mopy/config.py ('k') | services/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/tools/mopy/gn.py
diff --git a/mojo/tools/mopy/gn.py b/mojo/tools/mopy/gn.py
index 47253ea3f18213c579bd3540ab91dad582313b79..d8c8e0fad9d97c075b5b733fada3e3d408f997ac 100644
--- a/mojo/tools/mopy/gn.py
+++ b/mojo/tools/mopy/gn.py
@@ -24,6 +24,8 @@ def BuildDirectoryForConfig(config, src_root):
subdir += "android_"
if config.target_cpu != Config.ARCH_ARM:
subdir += config.target_cpu + "_"
+ elif config.target_os == Config.OS_FNL:
+ subdir += "fnl_"
elif config.target_os == Config.OS_IOS:
subdir += "ios_"
if config.is_simulator:
@@ -56,6 +58,7 @@ def GNArgsForConfig(config):
gn_args["is_clang"] = bool(config.is_clang)
else:
gn_args["is_clang"] = config.target_os not in (Config.OS_ANDROID,
+ Config.OS_FNL,
Config.OS_WINDOWS)
if config.values.get("use_goma"):
@@ -68,6 +71,14 @@ def GNArgsForConfig(config):
if config.target_os == Config.OS_ANDROID:
gn_args["target_os"] = "android"
+ elif config.target_os == Config.OS_FNL:
+ gn_args["target_os"] = "fnl"
+ gn_args["use_aura"] = False
+ gn_args["use_glib"] = False
+ gn_args["use_ozone"] = True
+ gn_args["use_system_harfbuzz"] = False
+ gn_args["target_sysroot"] = config.values.get("target_sysroot", "")
+ gn_args["toolchain_prefix"] = config.values.get("toolchain_prefix", "")
elif config.target_os == Config.OS_IOS:
gn_args["target_os"] = "ios"
gn_args["ios_deployment_target"] = "7.0"
@@ -132,6 +143,10 @@ def ConfigForGNArgs(args):
config_args["target_cpu"] = args.get("target_cpu")
config_args["dcheck_always_on"] = args.get("dcheck_always_on")
config_args["is_simulator"] = args.get("use_ios_simulator", False)
+ if "target_sysroot" in args:
+ config_args["target_sysroot"] = args.get("target_sysroot")
+ if "toolchain_prefix" in args:
+ config_args["toolchain_prefix"] = args.get("toolchain_prefix")
return Config(**config_args)
« no previous file with comments | « mojo/tools/mopy/config.py ('k') | services/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698