diff options
| author | Cole Faust <colefaust@google.com> | 2022-10-05 16:33:33 -0700 |
|---|---|---|
| committer | Cole Faust <colefaust@google.com> | 2022-10-05 16:33:33 -0700 |
| commit | 517a889b87816e22e0f592d989e91e0e4d4b29e1 (patch) | |
| tree | 658ce292419468f648dd84f82498365b0361ba51 | |
| parent | bfd94ee6a443fe41e2251328e50ddcce8f59095a (diff) | |
| download | libchrome-517a889b87816e22e0f592d989e91e0e4d4b29e1.tar.gz | |
Use modern_python_path_defaults
The python path for soong-built modules used to automatically
include all the subdirectories of the root package, and also
the package of the entrypoint script. Soong is being updated
to remove that, to match bazel's behavior and soong's behavior
with embedded_launcher: true, so update these scripts to work
with the new behavior.
Bug: 245583294
Test: m out/soong/.intermediates/external/libchrome/libmojo_mojom_templates/gen/cpp_templates.zip out/soong/.intermediates/external/libchrome/libmojo_mojom_templates/gen/java_templates.zip
Change-Id: I651030f86a118292955e006582d7131c878ac3fd
| -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 |