StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Enable new python path behavior by default

Browse Source 
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
This commit is contained in:
Cole Faust
2022-10-05 11:50:04 -07:00
parent 7ea3a82480
commit 5fe655d1c7
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
python/binary.go
View File

@@ -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),

3
python/python.go
View File

@@ -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")