diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-10-08 03:09:08 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-10-08 03:09:08 +0000 |
commit | 08f14cf7fcc47b5683bc6399a06aac662ccbaf6f (patch) | |
tree | 658ce292419468f648dd84f82498365b0361ba51 | |
parent | 292f8cf1daf892cdf873c8baa55e383bbd90cb6c (diff) | |
parent | 1eeb23a1c917961613967d05d38ca4da704ace5b (diff) | |
download | libchrome-08f14cf7fcc47b5683bc6399a06aac662ccbaf6f.tar.gz |
Snap for 9153162 from 1eeb23a1c917961613967d05d38ca4da704ace5b to udc-d1-release
Change-Id: Ia3ee5f71cb24189535777fc41fee336353b9d1c7
-rw-r--r-- | Android.bp | 5 | ||||
-rwxr-xr-x | mojo/public/tools/bindings/mojom_bindings_generator.py | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/Android.bp b/Android.bp index a97429f2dd..839721bef5 100644 --- a/Android.bp +++ b/Android.bp @@ -1171,6 +1171,7 @@ filegroup { python_binary_host { name: "jni_generator", + defaults: ["modern_python_path_defaults"], main: "base/android/jni_generator/jni_generator.py", srcs: [ "base/android/jni_generator/jni_generator.py", @@ -1180,6 +1181,7 @@ python_binary_host { python_binary_host { name: "jni_registration_generator", + defaults: ["modern_python_path_defaults"], main: "base/android/jni_generator/jni_registration_generator.py", srcs: [ "base/android/jni_generator/jni_generator.py", @@ -1190,6 +1192,7 @@ python_binary_host { python_binary_host { name: "mojom_bindings_generator", + defaults: ["modern_python_path_defaults"], main: "mojo/public/tools/bindings/mojom_bindings_generator.py", srcs: [ "build/**/*.py", @@ -1224,6 +1227,7 @@ genrule { python_binary_host { name: "mojom_generate_type_mappings", + defaults: ["modern_python_path_defaults"], main: "libchrome_tools/mojom_generate_type_mappings.py", srcs: [ "build/gn_helpers.py", @@ -1269,6 +1273,7 @@ genrule { python_binary_host { name: "mojom_types_downgrader", + defaults: ["modern_python_path_defaults"], main: "mojo/public/tools/bindings/mojom_types_downgrader.py", srcs: [ "mojo/public/tools/bindings/mojom_types_downgrader.py", diff --git a/mojo/public/tools/bindings/mojom_bindings_generator.py b/mojo/public/tools/bindings/mojom_bindings_generator.py index 8c8cb4309f..2e39b1e873 100755 --- a/mojo/public/tools/bindings/mojom_bindings_generator.py +++ b/mojo/public/tools/bindings/mojom_bindings_generator.py @@ -65,7 +65,7 @@ def LoadGenerators(generators_string): print("Unknown generator name %s" % generator_name) sys.exit(1) generator_module = importlib.import_module( - "generators.%s" % _BUILTIN_GENERATORS[language]) + "mojo.public.tools.bindings.generators.%s" % _BUILTIN_GENERATORS[language]) generators[language] = generator_module return generators |