package_from_installed: Put env in json file behind "env" key.

win_toolchain/package_from_installed.py

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """
 From a system-installed copy of the toolchain, packages all the required bits
 into a .zip file.
 
 It assumes default install locations for tools, in particular:
 - C:\Program Files (x86)\Microsoft Visual Studio 12.0\...
@@ skipping 253 matching lines @@
       f.write('set %s=%s%s\n' % (
           var, BatDirs(dirs), ';%PATH%' if var == 'PATH' else ''))
     f.write('goto :EOF\n')
 
     f.write(':x64\n')
     for var, dirs in env_x64.iteritems():
       f.write('set %s=%s%s\n' % (
           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):
   """We need to generate this file in the same way that the "from pieces"
   script does, so pull that in here."""
   tempdir = tempfile.mkdtemp()
   os.makedirs(os.path.join(tempdir, 'win_sdk', 'bin'))
   GenerateSetEnvCmd(tempdir)
   files.append((os.path.join(tempdir, 'win_sdk', 'bin', 'SetEnv.cmd'),
                 'win_sdk\\bin\\SetEnv.cmd'))
@@ skipping 91 matching lines @@
   sys.stdout.write('\rWrote to %s.%s\n' % (output, ' '*50))
   sys.stdout.flush()
 
   RenameToSha1(output)
 
   return 0
 
 
 if __name__ == '__main__':
   sys.exit(main())