From 66bbc6681217a1e017f2107b799251eff29b3035 Mon Sep 17 00:00:00 2001 From: Cole Faust Date: Thu, 28 Mar 2024 18:01:43 -0700 Subject: Set embedded_launcher on python binaries embedded_launcher: true is being made the default, but not everything works with it currently. Enable it where possible, and explicitly set it to false on the modules it doesn't work with so that they're not affected when the default changes. Bug: 331488610 Test: mm Change-Id: Ie7caa940fe0bb47016d0696ff362698fcff22854 --- Android.bp | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/Android.bp b/Android.bp index 700324466f..340a194ac8 100644 --- a/Android.bp +++ b/Android.bp @@ -1220,6 +1220,11 @@ python_binary_host { "base/android/jni_generator/jni_registration_generator.py", "build/**/*.py", ], + version: { + py3: { + embedded_launcher: true, + }, + }, } python_binary_host { @@ -1237,6 +1242,12 @@ python_binary_host { "mojo/public/tools/bindings/generators/java_templates/*.tmpl", "mojo/public/tools/bindings/generators/js_templates/*.tmpl", ], + version: { + py3: { + // TODO(b/174041232): Enable embedded_launcher + embedded_launcher: false, + }, + }, } genrule { @@ -1268,6 +1279,12 @@ python_binary_host { "mojo/public/tools/bindings/pylib/mojom/generate/module.py", "mojo/public/tools/bindings/pylib/mojom/generate/pack.py", ], + version: { + py3: { + // TODO(b/174041232): Enable embedded_launcher + embedded_launcher: false, + }, + }, } genrule { @@ -1307,6 +1324,11 @@ python_binary_host { srcs: [ "mojo/public/tools/bindings/mojom_types_downgrader.py", ], + version: { + py3: { + embedded_launcher: true, + }, + }, } generate_mojom_downgraded_files { -- cgit v1.2.3