diff options
| -rw-r--r-- | python/binary.go | 4 | ||||
| -rw-r--r-- | 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") |