Upgrade GYP to r1034

tools/gyp/pylib/gyp/MSVSNew.py

@@ -248,10 +248,13 @@ def NameThenGuid(a, b):
     sln_root = os.path.split(self.path)[0]
     for e in all_entries:
       relative_path = gyp.common.RelativePath(e.path, sln_root)
+      # msbuild does not accept an empty folder_name.
+      # use '.' in case relative_path is empty.
+      folder_name = relative_path.replace('/', '\\') or '.'
       f.write('Project("%s") = "%s", "%s", "%s"\r\n' % (
           e.entry_type_guid,          # Entry type GUID
           e.name,                     # Folder name
-          relative_path.replace('/', '\\'),  # Folder name (again)
+          folder_name,                # Folder name (again)
           e.get_guid(),               # Entry GUID
       ))
 

tools/gyp/pylib/gyp/generator/dump_dependency_json.py

@@ -32,6 +32,15 @@ def CalculateVariables(default_variables, params):
   default_variables['OS'] = generator_flags.get('os', 'linux')
 
 
+def CalculateGeneratorInputInfo(params):
+  """Calculate the generator specific info that gets fed to input (called by
+  gyp)."""
+  generator_flags = params.get('generator_flags', {})
+  if generator_flags.get('adjust_static_libraries', False):
+    global generator_wants_static_library_dependencies_adjusted
+    generator_wants_static_library_dependencies_adjusted = True
+
+
 def GenerateOutput(target_list, target_dicts, data, params):
   # Map of target -> list of targets it depends on.
   edges = {}