Index: mojo/public/tools/bindings/mojom_bindings_generator.gypi |
diff --git a/mojo/public/tools/bindings/mojom_bindings_generator.gypi b/mojo/public/tools/bindings/mojom_bindings_generator.gypi |
index e325a9017a885c6c12840ae65ca005d86fce9426..e56190608a3ee0930c22e85dfe0636a65165e261 100644 |
--- a/mojo/public/tools/bindings/mojom_bindings_generator.gypi |
+++ b/mojo/public/tools/bindings/mojom_bindings_generator.gypi |
@@ -5,7 +5,7 @@ |
{ |
'rules': [ |
{ |
- 'rule_name': 'Generate C++ source files from mojom files', |
+ 'rule_name': 'Generate C++, JS and Java source files from mojom files', |
'extension': 'mojom', |
'variables': { |
# TODO(sky): uncomment this once gyp bug fixed and remove explicit |
@@ -14,6 +14,7 @@ |
# '<!(python <(DEPTH)/build/inverse_depth.py <(DEPTH))', |
'mojom_bindings_generator': |
'<(DEPTH)/mojo/public/tools/bindings/mojom_bindings_generator.py', |
+ 'java_out_dir': '<(PRODUCT_DIR)/java_mojo/<(_target_name)/src', |
}, |
'inputs': [ |
'<(mojom_bindings_generator)', |
@@ -36,11 +37,16 @@ |
'<(DEPTH)/mojo/public/tools/bindings/generators/cpp_templates/struct_destructor.tmpl', |
'<(DEPTH)/mojo/public/tools/bindings/generators/cpp_templates/struct_macros.tmpl', |
'<(DEPTH)/mojo/public/tools/bindings/generators/cpp_templates/wrapper_class_declaration.tmpl', |
+ '<(DEPTH)/mojo/public/tools/bindings/generators/java_templates/constant_definition.tmpl', |
+ '<(DEPTH)/mojo/public/tools/bindings/generators/java_templates/constants.java.tmpl', |
+ '<(DEPTH)/mojo/public/tools/bindings/generators/java_templates/header.java.tmpl', |
+ '<(DEPTH)/mojo/public/tools/bindings/generators/java_templates/java_macros.tmpl', |
'<(DEPTH)/mojo/public/tools/bindings/generators/js_templates/enum_definition.tmpl', |
'<(DEPTH)/mojo/public/tools/bindings/generators/js_templates/interface_definition.tmpl', |
'<(DEPTH)/mojo/public/tools/bindings/generators/js_templates/module.js.tmpl', |
'<(DEPTH)/mojo/public/tools/bindings/generators/js_templates/struct_definition.tmpl', |
'<(DEPTH)/mojo/public/tools/bindings/generators/mojom_cpp_generator.py', |
+ '<(DEPTH)/mojo/public/tools/bindings/generators/mojom_java_generator.py', |
'<(DEPTH)/mojo/public/tools/bindings/generators/mojom_js_generator.py', |
'<(DEPTH)/mojo/public/tools/bindings/pylib/mojom/__init__.py', |
'<(DEPTH)/mojo/public/tools/bindings/pylib/mojom/error.py', |
@@ -68,6 +74,7 @@ |
'--use_chromium_bundled_pylibs', |
'-d', '<(DEPTH)', |
'-o', '<(SHARED_INTERMEDIATE_DIR)/<(mojom_base_output_dir)/<(RULE_INPUT_DIRNAME)', |
+ '--java_output_directory=<(java_out_dir)', |
], |
'message': 'Generating Mojo bindings from <(RULE_INPUT_DIRNAME)/<(RULE_INPUT_ROOT).mojom', |
'process_outputs_as_sources': 1, |
@@ -82,6 +89,11 @@ |
'<(DEPTH)', |
'<(SHARED_INTERMEDIATE_DIR)', |
], |
+ 'variables': { |
+ 'generated_src_dirs': [ |
+ '<(PRODUCT_DIR)/java_mojo/<(_target_name)/src', |
+ ], |
+ }, |
}, |
'hard_dependency': 1, |
} |