win: make msvs_shard work properly for static_library references

pylib/gyp/MSVSUtil.py

 # Copyright (c) 2013 Google Inc. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Utility functions shared amongst the Windows generators."""
 
 import copy
 import os
 
 
@@ skipping 91 matching lines @@
              new_target_dicts[name]['target_name'], i)
         sources = new_target_dicts[name].get('sources', [])
         new_sources = []
         for pos in range(i, len(sources), targets_to_shard[t]):
           new_sources.append(sources[pos])
         new_target_dicts[name]['sources'] = new_sources
     else:
       new_target_dicts[t] = target_dicts[t]
   # Shard dependencies.
   for t in new_target_dicts:
-    dependencies = copy.copy(new_target_dicts[t].get('dependencies', []))
-    new_dependencies = []
-    for d in dependencies:
-      if d in targets_to_shard:
-        for i in range(targets_to_shard[d]):
-          new_dependencies.append(_ShardName(d, i))
-      else:
-        new_dependencies.append(d)
-    new_target_dicts[t]['dependencies'] = new_dependencies
+    for deptype in ('dependencies', 'dependencies_original'):
+      dependencies = copy.copy(new_target_dicts[t].get(deptype, []))
+      new_dependencies = []
+      for d in dependencies:
+        if d in targets_to_shard:
+          for i in range(targets_to_shard[d]):
+            new_dependencies.append(_ShardName(d, i))
+        else:
+          new_dependencies.append(d)
+      new_target_dicts[t][deptype] = new_dependencies
 
   return (new_target_list, new_target_dicts)
 
 
 def _GetPdbPath(target_dict, config_name, vars):
   """Returns the path to the PDB file that will be generated by a given
   configuration.
 
   The lookup proceeds as follows:
     - Look for an explicit path in the VCLinkerTool configuration block.
@@ skipping 126 matching lines @@
     # Add the new targets. They must go to the beginning of the list so that
     # the dependency generation works as expected in ninja.
     target_list.insert(0, full_copy_target_name)
     target_list.insert(0, full_shim_target_name)
     target_dicts[full_copy_target_name] = copy_dict
     target_dicts[full_shim_target_name] = shim_dict
 
     # Update the original target to depend on the shim target.
     target_dict.setdefault('dependencies', []).append(full_shim_target_name)
 
-  return (target_list, target_dicts)
+  return (target_list, target_dicts)