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

Unified Diff: win_toolchain/package_from_installed.py

Issue 1718083003: package_from_installed: Put env in json file behind "env" key. (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/depot_tools.git@master
Patch Set: Created 4 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:
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: win_toolchain/package_from_installed.py
diff --git a/win_toolchain/package_from_installed.py b/win_toolchain/package_from_installed.py
index 500e51cc1fd8c0166d0b937416b683868c81a37f..d0d30ff96f685ba09d97f568e2bcba8d5e10d8de 100644
--- a/win_toolchain/package_from_installed.py
+++ b/win_toolchain/package_from_installed.py
@@ -271,10 +271,12 @@ def GenerateSetEnvCmd(target_dir):
var, BatDirs(dirs), ';%PATH%' if var == 'PATH' else ''))
with open(set_env_prefix + '.x86.json', 'wb') as f:
assert not set(env.keys()) & set(env_x86.keys()), 'dupe keys'
- json.dump(collections.OrderedDict(env.items() + env_x86.items()), f)
+ json.dump({'env': collections.OrderedDict(env.items() + env_x86.items())},
+ f)
with open(set_env_prefix + '.x64.json', 'wb') as f:
assert not set(env.keys()) & set(env_x64.keys()), 'dupe keys'
- json.dump(collections.OrderedDict(env.items() + env_x64.items()), f)
+ json.dump({'env': collections.OrderedDict(env.items() + env_x64.items())},
+ f)
def AddEnvSetup(files):
« 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