Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(528)

Unified Diff: trunk/src/mojo/public/tools/bindings/mojom_bindings_generator.gypi

Issue 311643002: Revert 274278 "Generate java bindings for constants." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: trunk/src/mojo/public/tools/bindings/mojom_bindings_generator.gypi
===================================================================
--- trunk/src/mojo/public/tools/bindings/mojom_bindings_generator.gypi (revision 274295)
+++ trunk/src/mojo/public/tools/bindings/mojom_bindings_generator.gypi (working copy)
@@ -5,7 +5,7 @@
{
'rules': [
{
- 'rule_name': 'Generate C++, JS and Java source files from mojom files',
+ 'rule_name': 'Generate C++ source files from mojom files',
'extension': 'mojom',
'variables': {
'mojom_base_output_dir':
@@ -12,7 +12,6 @@
'<!(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)',
@@ -35,16 +34,11 @@
'<(DEPTH)/mojo/public/tools/bindings/generators/cpp_templates/struct_serialization_definition.tmpl',
'<(DEPTH)/mojo/public/tools/bindings/generators/cpp_templates/wrapper_class_declaration.tmpl',
'<(DEPTH)/mojo/public/tools/bindings/generators/cpp_templates/wrapper_class_definition.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',
@@ -72,7 +66,6 @@
'--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,
@@ -87,11 +80,6 @@
'<(DEPTH)',
'<(SHARED_INTERMEDIATE_DIR)',
],
- 'variables': {
- 'generated_src_dirs': [
- '<(PRODUCT_DIR)/java_mojo/<(_target_name)/src',
- ],
- },
},
'hard_dependency': 1,
}

Powered by Google App Engine
This is Rietveld 408576698