From af4b13dbe4c4063f784777fc4f58b6fd4f727c6a Mon Sep 17 00:00:00 2001 From: Cole Faust Date: Wed, 14 Sep 2022 15:25:15 -0700 Subject: Add flag to not add top-level modules to PYTHONPATH stub_template_host.txt added all the top-level modules to the PYTHONPATH, which isn't correct, and caused absl.logging to override the built-in logging module. Removing this also makes it more consistent with python binaries built with embedded_launcher: true. embedded_launcher: true binaries don't add the top-level modules. Fixes: 245583294 Test: m py_dont_add_top_level_dirs_test && out/host/linux-x86/testcases/py_dont_add_top_level_dirs_test/x86_64/py_dont_add_top_level_dirs_test Change-Id: Id3069565d2b2c4b2bda0ff5301e757a7b4201751 --- python/python.go | 4 ---- 1 file changed, 4 deletions(-) (limited to 'python/python.go') diff --git a/python/python.go b/python/python.go index daf7c14a0..f6029c250 100644 --- a/python/python.go +++ b/python/python.go @@ -356,10 +356,6 @@ var ( protoExt = ".proto" pyVersion2 = "PY2" pyVersion3 = "PY3" - initFileName = "__init__.py" - mainFileName = "__main__.py" - entryPointFile = "entry_point.txt" - parFileExt = ".zip" internalPath = "internal" ) -- cgit v1.2.3-59-g8ed1b