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

mojo/public/bindings/mojom_bindings_generator.gypi

 # Copyright 2013 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.
 
 {
-  'variables': {
-    'output_dir': '<(SHARED_INTERMEDIATE_DIR)/mojom',
-  },
   'rules': [
     {
       'rule_name': 'Generate C++ source files from mojom files',
       'extension': 'mojom',
       'variables': {
+        'mojom_base_output_dir':
+            '<!(python <(DEPTH)/build/inverse_depth.py <(DEPTH))',
         'mojom_bindings_generator':
             '<(DEPTH)/mojo/public/bindings/mojom_bindings_generator.py',
       },
       'inputs': [
         '<(mojom_bindings_generator)',
         '<(DEPTH)/mojo/public/bindings/generators/cpp_templates/enum_declaration.tmpl',
         '<(DEPTH)/mojo/public/bindings/generators/cpp_templates/interface_declaration.tmpl',
         '<(DEPTH)/mojo/public/bindings/generators/cpp_templates/interface_definition.tmpl',
         '<(DEPTH)/mojo/public/bindings/generators/cpp_templates/interface_proxy_declaration.tmpl',
         '<(DEPTH)/mojo/public/bindings/generators/cpp_templates/interface_stub_declaration.tmpl',
         '<(DEPTH)/mojo/public/bindings/generators/cpp_templates/module.cc.tmpl',
         '<(DEPTH)/mojo/public/bindings/generators/cpp_templates/module.h.tmpl',
-        '<(DEPTH)/mojo/public/bindings/generators/cpp_templates/module_internal.h.tmpl',
+        '<(DEPTH)/mojo/public/bindings/generators/cpp_templates/module-internal.h.tmpl',
         '<(DEPTH)/mojo/public/bindings/generators/cpp_templates/params_definition.tmpl',
         '<(DEPTH)/mojo/public/bindings/generators/cpp_templates/struct_builder_definition.tmpl',
         '<(DEPTH)/mojo/public/bindings/generators/cpp_templates/struct_declaration.tmpl',
         '<(DEPTH)/mojo/public/bindings/generators/cpp_templates/struct_definition.tmpl',
         '<(DEPTH)/mojo/public/bindings/generators/cpp_templates/struct_destructor.tmpl',
         '<(DEPTH)/mojo/public/bindings/generators/cpp_templates/struct_macros.tmpl',
         '<(DEPTH)/mojo/public/bindings/generators/cpp_templates/wrapper_class_declaration.tmpl',
         '<(DEPTH)/mojo/public/bindings/generators/js_templates/enum_definition.tmpl',
         '<(DEPTH)/mojo/public/bindings/generators/js_templates/interface_definition.tmpl',
         '<(DEPTH)/mojo/public/bindings/generators/js_templates/module.js.tmpl',
         '<(DEPTH)/mojo/public/bindings/generators/js_templates/struct_definition.tmpl',
         '<(DEPTH)/mojo/public/bindings/generators/mojom_cpp_generator.py',
         '<(DEPTH)/mojo/public/bindings/generators/mojom_js_generator.py',
         '<(DEPTH)/mojo/public/bindings/pylib/parse/__init__.py',
         '<(DEPTH)/mojo/public/bindings/pylib/parse/mojo_lexer.py',
         '<(DEPTH)/mojo/public/bindings/pylib/parse/mojo_parser.py',
         '<(DEPTH)/mojo/public/bindings/pylib/parse/mojo_translate.py',
         '<(DEPTH)/mojo/public/bindings/pylib/generate/__init__.py',
         '<(DEPTH)/mojo/public/bindings/pylib/generate/mojom.py',
         '<(DEPTH)/mojo/public/bindings/pylib/generate/mojom_data.py',
         '<(DEPTH)/mojo/public/bindings/pylib/generate/mojom_generator.py',
         '<(DEPTH)/mojo/public/bindings/pylib/generate/mojom_pack.py',
         '<(DEPTH)/mojo/public/bindings/pylib/generate/template_expander.py',
       ],
       'outputs': [
-        '<(output_dir)/<(RULE_INPUT_ROOT).cc',
-        '<(output_dir)/<(RULE_INPUT_ROOT).h',
-        '<(output_dir)/<(RULE_INPUT_ROOT).js',
-        '<(output_dir)/<(RULE_INPUT_ROOT)_internal.h',
+        '<(SHARED_INTERMEDIATE_DIR)/<(mojom_base_output_dir)/<(RULE_INPUT_PATH).cc',
+        '<(SHARED_INTERMEDIATE_DIR)/<(mojom_base_output_dir)/<(RULE_INPUT_PATH).h',
+        '<(SHARED_INTERMEDIATE_DIR)/<(mojom_base_output_dir)/<(RULE_INPUT_PATH).js',
+        '<(SHARED_INTERMEDIATE_DIR)/<(mojom_base_output_dir)/<(RULE_INPUT_PATH)-internal.h',
       ],
       'action': [
         'python', '<@(mojom_bindings_generator)',
         '<(RULE_INPUT_PATH)',
-        '-i', 'mojom',
-        '-o', '<(output_dir)',
+        '-d', '<(DEPTH)',
+        '-o', '<(SHARED_INTERMEDIATE_DIR)/<(mojom_base_output_dir)/<(RULE_INPUT_DIRNAME)',
       ],
-      'message': 'Generating C++ from mojom <(RULE_INPUT_PATH)',
+      'message': 'Generating C++ from <(RULE_INPUT_PATH)',
       'process_outputs_as_sources': 1,
     }
   ],
   'dependencies': [
     '<(DEPTH)/mojo/mojo.gyp:mojo_bindings',
     '<(DEPTH)/mojo/mojo.gyp:mojo_system',
   ],
   'include_dirs': [
     '<(DEPTH)',
     '<(SHARED_INTERMEDIATE_DIR)',
   ],
   'direct_dependent_settings': {
     'include_dirs': [
       '<(DEPTH)',
       '<(SHARED_INTERMEDIATE_DIR)',
     ],
   },
   'hard_dependency': 1,
 }