Mojo: Include "path/to/foo.mojom.h"

mojo/public/bindings/generators/mojom_cpp_generator.py

Index: mojo/public/bindings/generators/mojom_cpp_generator.py
diff --git a/mojo/public/bindings/generators/mojom_cpp_generator.py b/mojo/public/bindings/generators/mojom_cpp_generator.py
index 4420aafd88f7f01f34e01cd1b14f2afb818fff4d..dcff2401b2ae8b8c3be11d21ea41389d8793a0f2 100644
--- a/mojo/public/bindings/generators/mojom_cpp_generator.py
+++ b/mojo/public/bindings/generators/mojom_cpp_generator.py
@@ -141,6 +141,7 @@ class Generator(mojom_generator.Generator):
     return {
       "module": self.module,
       "module_name": self.module.name,
+      "module_path": self.module.path,
       "namespace": self.module.namespace,
       "imports": self.module.imports,
       "kinds": self.module.kinds,
@@ -154,7 +155,7 @@ class Generator(mojom_generator.Generator):
   def GenerateModuleHeader(self):
     return self.GetJinjaExports()
 
-  @UseJinja("cpp_templates/module_internal.h.tmpl", filters=cpp_filters)
+  @UseJinja("cpp_templates/module-internal.h.tmpl", filters=cpp_filters)
   def GenerateModuleInternalHeader(self):
     return self.GetJinjaExports()
 
@@ -165,7 +166,7 @@ class Generator(mojom_generator.Generator):
   def GenerateFiles(self):
     self.Write(self.GenerateModuleHeader(), "%s.h" % self.module.name)
     self.Write(self.GenerateModuleInternalHeader(),
-        "%s_internal.h" % self.module.name)
+        "%s-internal.h" % self.module.name)
     self.Write(self.GenerateModuleSource(), "%s.cc" % self.module.name)
 
   def GetIncludePrefix(self):