diff options
| author | msw <msw@chromium.org> | 2015-05-10 10:13:37 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-05-10 17:13:57 +0000 |
| commit | e06a385703b9bfbfd4e800bebfbb0023a8949a29 (patch) | |
| tree | eb39f0e7237f6de3950bd483fc7758cc22dbbcd5 /mojo | |
| parent | f40b051cb1d0c207d8c6a4228fbe8176397775c8 (diff) | |
| download | chromium_src-e06a385703b9bfbfd4e800bebfbb0023a8949a29.zip chromium_src-e06a385703b9bfbfd4e800bebfbb0023a8949a29.tar.gz chromium_src-e06a385703b9bfbfd4e800bebfbb0023a8949a29.tar.bz2 | |
Fix apptest_runner.py's use of GN's target_os.
This makes the apptest runner actually use the android build dir...
BUG=486220
TEST="mojo/tools/apptest_runner.py mojo/tools/data/apptests out/android_Debug/" actually uses android_Debug, not Debug.
R=sky@chromium.org
Review URL: https://codereview.chromium.org/1135613003
Cr-Commit-Position: refs/heads/master@{#329076}
Diffstat (limited to 'mojo')
| -rw-r--r-- | mojo/tools/mopy/gn.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mojo/tools/mopy/gn.py b/mojo/tools/mopy/gn.py index 024e00f..560e8db 100644 --- a/mojo/tools/mopy/gn.py +++ b/mojo/tools/mopy/gn.py @@ -107,7 +107,7 @@ def ConfigForGNArgs(args): if config_args["use_goma"]: config_args["goma_dir"] = args.get("goma_dir") config_args["use_nacl"] = args.get("mojo_use_nacl", False) - 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) @@ -133,8 +133,8 @@ def ParseGNConfig(build_dir): value = result.group(2) values[key] = ast.literal_eval(TRANSLATIONS.get(value, value)) - # TODO(msw): Mojo's script uses GN's is_debug arg to determine the build dir. - # It should probably just use the argument build_dir instead. + # TODO(msw): The build dir is derived from GN args 'is_debug' and 'target_os'. + # The script should probably use its 'build_dir' argument instead. if not "is_debug" in values: values["is_debug"] = "Debug" in build_dir |