diff options
| author | Risan <risan@chromium.org> | 2018-01-17 07:29:49 +0000 |
|---|---|---|
| committer | Risan <risan@google.com> | 2018-01-18 03:56:02 +0900 |
| commit | cf86eeff81b51841769b5bb052878423ddb95951 (patch) | |
| tree | 6d54bfb55a7a70ad40f9a765cfdf0207abb923f1 | |
| parent | 359ef58a9de2454aa6a9ff1cbf73d2d3b7952421 (diff) | |
| download | libmojo-cf86eeff81b51841769b5bb052878423ddb95951.tar.gz | |
Use importlib instead of imp in mojo_bindings_gen
This is to fix incompatibillities issue with Android.bp.
Bug: b:27569341
Test: Compile
Change-Id: Ifa44950b7de01b27dfd266495fc88f820a7b6fc2
Reviewed-on: https://chromium-review.googlesource.com/865734
Reviewed-by: Yuzhu Shen <yzshen@chromium.org>
Commit-Queue: Risan <risan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#529666}
| -rw-r--r-- | mojo/public/tools/bindings/generators/__init__.py | 0 | ||||
| -rwxr-xr-x | mojo/public/tools/bindings/mojom_bindings_generator.py | 17 |
2 files changed, 7 insertions, 10 deletions
diff --git a/mojo/public/tools/bindings/generators/__init__.py b/mojo/public/tools/bindings/generators/__init__.py new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/mojo/public/tools/bindings/generators/__init__.py diff --git a/mojo/public/tools/bindings/mojom_bindings_generator.py b/mojo/public/tools/bindings/mojom_bindings_generator.py index 3a0b6fc..a5fb51b 100755 --- a/mojo/public/tools/bindings/mojom_bindings_generator.py +++ b/mojo/public/tools/bindings/mojom_bindings_generator.py @@ -7,7 +7,7 @@ import argparse -import imp +import importlib import json import os import pprint @@ -43,9 +43,9 @@ from mojom.parse.parser import Parse _BUILTIN_GENERATORS = { - "c++": "mojom_cpp_generator.py", - "javascript": "mojom_js_generator.py", - "java": "mojom_java_generator.py", + "c++": "mojom_cpp_generator", + "javascript": "mojom_js_generator", + "java": "mojom_java_generator", } @@ -57,14 +57,11 @@ def LoadGenerators(generators_string): generators = {} for generator_name in [s.strip() for s in generators_string.split(",")]: language = generator_name.lower() - if language in _BUILTIN_GENERATORS: - generator_name = os.path.join(script_dir, "generators", - _BUILTIN_GENERATORS[language]) - else: + if language not in _BUILTIN_GENERATORS: print "Unknown generator name %s" % generator_name sys.exit(1) - generator_module = imp.load_source(os.path.basename(generator_name)[:-3], - generator_name) + generator_module = importlib.import_module( + "generators.%s" % _BUILTIN_GENERATORS[language]) generators[language] = generator_module return generators |