From 02ad4016ccce701bfef751a05b4fb9ef181eefc5 Mon Sep 17 00:00:00 2001 From: Cole Faust Date: Tue, 11 Oct 2022 18:12:29 +0000 Subject: [PATCH] Revert^2 "Enable new python path behavior by default" This reverts commit 4d5cc709fa16f5dc78f690369e946fcf66156312. Reason for revert: Acloud issue was fixed in aosp/2243150, make sure the host unit tests are run on this cl via go/abtd before submitting Change-Id: Ie148430d331a01a9877adaf3cb88f1c57af136a0 Bug: 245583294 Bug: 247578564 Bug: 251688241 --- python/binary.go | 4 ++-- python/python.go | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/python/binary.go b/python/binary.go index e6324a3b5..f4ad626b8 100644 --- a/python/binary.go +++ b/python/binary.go @@ -192,8 +192,8 @@ func (binary *binaryDecorator) bootstrap(ctx android.ModuleContext, actualVersio }) } - addTopDirectoriesToPath := !proptools.BoolDefault(binary.binaryProperties.Dont_add_top_level_directories_to_path, false) - dontAddEntrypointFolderToPath := proptools.BoolDefault(binary.binaryProperties.Dont_add_entrypoint_folder_to_path, false) + addTopDirectoriesToPath := !proptools.BoolDefault(binary.binaryProperties.Dont_add_top_level_directories_to_path, true) + dontAddEntrypointFolderToPath := proptools.BoolDefault(binary.binaryProperties.Dont_add_entrypoint_folder_to_path, true) binFile := registerBuildActionForParFile(ctx, embeddedLauncher, launcherPath, binary.getHostInterpreterName(ctx, actualVersion), diff --git a/python/python.go b/python/python.go index f6029c250..6f3a0ecf3 100644 --- a/python/python.go +++ b/python/python.go @@ -677,8 +677,7 @@ func (p *Module) createSrcsZip(ctx android.ModuleContext, pkgPath string) androi protoFlags := android.GetProtoFlags(ctx, &p.protoProperties) protoFlags.OutTypeFlag = "--python_out" - // TODO(b/247578564): Change the default to true, and then eventually remove respect_pkg_path - protosRespectPkgPath := proptools.BoolDefault(p.properties.Proto.Respect_pkg_path, false) + protosRespectPkgPath := proptools.BoolDefault(p.properties.Proto.Respect_pkg_path, true) pkgPathForProtos := pkgPath if pkgPathForProtos != "" && protosRespectPkgPath { pkgPathStagingDir := android.PathForModuleGen(ctx, "protos_staged_for_pkg_path")