diff options
| author | 2022-10-05 11:50:04 -0700 | |
|---|---|---|
| committer | 2022-10-05 11:51:26 -0700 | |
| commit | 5fe655d1c71ee079dd46e93c96b54aae39a10d16 (patch) | |
| tree | f6674c96179ae1a7d54150a18cc85b5d8a9ea9ac | |
| parent | 7ea3a8248060ee279d17bf2ca71051d049917278 (diff) | |
Enable new python path behavior by default
Now that usages have been updated, enable the new
behavior by default. If everything goes well with
this, we can then remove the flags.
Bug: 245583294
Bug: 247578564
Test: Presubmits
Change-Id: Idac8d2dc0f96ae750dba4a99b32525676d0d6f25
| -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") |