summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2016-12-16 10:55:58 +0100
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2018-05-23 13:31:33 +0200
commit1ffcf65b3068bf89394550daad5233feea574714 (patch)
tree3c49ef415577e05cf2eeae84ec32d97c54f4bf1e
parentc01fa63026ae6c1d6dd1ebd7e13281827723c8e8 (diff)
downloadqtwebengine-chromium-1ffcf65b3068bf89394550daad5233feea574714.tar.gz
Don't generate Java bindings
These needs Android SDK and are only used on Android. Change-Id: I12956be56946de58d3bc644e0f990ca197aa8037 Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
-rw-r--r--chromium/mojo/public/tools/bindings/BUILD.gn1
-rw-r--r--chromium/mojo/public/tools/bindings/mojom.gni1
-rwxr-xr-xchromium/mojo/public/tools/bindings/mojom_bindings_generator.py3
3 files changed, 1 insertions, 4 deletions
diff --git a/chromium/mojo/public/tools/bindings/BUILD.gn b/chromium/mojo/public/tools/bindings/BUILD.gn
index 371a453f0ed..d9caf2f154a 100644
--- a/chromium/mojo/public/tools/bindings/BUILD.gn
+++ b/chromium/mojo/public/tools/bindings/BUILD.gn
@@ -73,7 +73,6 @@ action("precompile_templates") {
inputs = jinja2_sources
outputs = [
"$target_gen_dir/cpp_templates.zip",
- "$target_gen_dir/java_templates.zip",
"$target_gen_dir/js_templates.zip",
]
args = [
diff --git a/chromium/mojo/public/tools/bindings/mojom.gni b/chromium/mojo/public/tools/bindings/mojom.gni
index 317d8c0fd3b..0401e5c7ac5 100644
--- a/chromium/mojo/public/tools/bindings/mojom.gni
+++ b/chromium/mojo/public/tools/bindings/mojom.gni
@@ -55,7 +55,6 @@ mojom_generator_script = "$mojom_generator_root/mojom_bindings_generator.py"
mojom_generator_sources = [
"$mojom_generator_root/generators/mojom_cpp_generator.py",
"$mojom_generator_root/generators/mojom_js_generator.py",
- "$mojom_generator_root/generators/mojom_java_generator.py",
"$mojom_generator_root/pylib/mojom/__init__.py",
"$mojom_generator_root/pylib/mojom/error.py",
"$mojom_generator_root/pylib/mojom/generate/__init__.py",
diff --git a/chromium/mojo/public/tools/bindings/mojom_bindings_generator.py b/chromium/mojo/public/tools/bindings/mojom_bindings_generator.py
index 4117629e996..7170d9a16f2 100755
--- a/chromium/mojo/public/tools/bindings/mojom_bindings_generator.py
+++ b/chromium/mojo/public/tools/bindings/mojom_bindings_generator.py
@@ -50,7 +50,6 @@ from mojom.parse.parser import Parse
_BUILTIN_GENERATORS = {
"c++": "mojom_cpp_generator",
"javascript": "mojom_js_generator",
- "java": "mojom_java_generator",
}
@@ -399,7 +398,7 @@ def main():
generate_parser.add_argument("-g", "--generators",
dest="generators_string",
metavar="GENERATORS",
- default="c++,javascript,java",
+ default="c++,javascript",
help="comma-separated list of generators")
generate_parser.add_argument(
"-I", dest="import_directories", action="append", metavar="directory",