diff options
| author | Cole Faust <colefaust@google.com> | 2022-10-06 17:49:56 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-10-06 17:49:56 +0000 |
| commit | d12a48c418f73f71f249764e5eb4d3520fb021a7 (patch) | |
| tree | 658ce292419468f648dd84f82498365b0361ba51 | |
| parent | f0bd96553a317429c6d04a415e385ae8a9c6911a (diff) | |
| parent | 517a889b87816e22e0f592d989e91e0e4d4b29e1 (diff) | |
| download | libchrome-d12a48c418f73f71f249764e5eb4d3520fb021a7.tar.gz | |
Use modern_python_path_defaults am: 517a889b87
Original change: https://android-review.googlesource.com/c/platform/external/libchrome/+/2241841
Change-Id: I188e1dfdd2c47bb7f713e572c10b9dad11e96725
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -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 |