Support MASM in MSBuild and Winja

pylib/gyp/win_tool.py

Index: pylib/gyp/win_tool.py
diff --git a/pylib/gyp/win_tool.py b/pylib/gyp/win_tool.py
index 7b065736383caec169cf8df1163f99f59f4bf08e..2e2531669cc4f8cf63a8e212471f17ce25e11b90 100755
--- a/pylib/gyp/win_tool.py
+++ b/pylib/gyp/win_tool.py
@@ -148,11 +148,14 @@ class WinTool(object):
         print line
     return popen.returncode
 
-  def ExecAsmWrapper(self, arch, *args):
+  def ExecAsmWrapper(self, arch, *flags):
     """Filter logo banner from invocations of asm.exe."""
     env = self._GetEnv(arch)
-    # MSVS doesn't assemble x64 asm files.
-    if arch == 'environment.x64':
+    if arch == 'environment.x86':
+      args = ['ml', '/nologo'] + list(flags)
+    elif arch == 'environment.x64':
+      args = ['ml64', '/nologo'] + list(flags)
+    else:
       return 0
     popen = subprocess.Popen(args, shell=True, env=env,
                              stdout=subprocess.PIPE, stderr=subprocess.STDOUT)