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

Unified Diff: tools/cr/cr/actions/gn.py

Issue 1108133004: cr: Pass absolute path to output directory to gn (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Foiled again. Created 5 years, 8 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/cr/cr/actions/gn.py
diff --git a/tools/cr/cr/actions/gn.py b/tools/cr/cr/actions/gn.py
index e532d1d77c18e77a3ddd61313440ac6bcdfe8b3f..a79aa81fc24d2a6aded7fe8ab7577363d2909b7d 100644
--- a/tools/cr/cr/actions/gn.py
+++ b/tools/cr/cr/actions/gn.py
@@ -55,9 +55,8 @@ class GnPrepareOut(cr.PrepareOut):
if cr.context.verbose >= 1:
print cr.context.Substitute('Invoking gn with {GN_ARGS}')
- args_file = os.path.join(cr.context['CR_SRC'],
- cr.context['CR_OUT_FULL'],
- 'args.gn')
+ out_path = os.path.join(cr.context['CR_SRC'], cr.context['CR_OUT_FULL'])
+ args_file = os.path.join(out_path, 'args.gn')
args = {}
# Split the argument list while preserving quotes,
# e.g., a="b c" becomes ('a', '"b c"').
@@ -82,8 +81,4 @@ class GnPrepareOut(cr.PrepareOut):
with open(args_file, 'w') as f:
f.write('\n'.join(arg_lines) + '\n')
- cr.Host.Execute(
- 'gn',
- 'gen',
- '{CR_OUT_FULL}',
- )
+ cr.Host.Execute('gn', 'gen', out_path)
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698