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

Revert^2 "Enable new python path behavior by default"

Browse Source 
This reverts commit 4d5cc709fa.

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
This commit is contained in:
Cole Faust
2022-10-11 18:12:29 +00:00
parent 4d5cc709fa
commit 02ad4016cc
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) addTopDirectoriesToPath := !proptools.BoolDefault(binary.binaryProperties.Dont_add_top_level_directories_to_path, true)
dontAddEntrypointFolderToPath := proptools.BoolDefault(binary.binaryProperties.Dont_add_entrypoint_folder_to_path, false) dontAddEntrypointFolderToPath := proptools.BoolDefault(binary.binaryProperties.Dont_add_entrypoint_folder_to_path, true)
binFile := registerBuildActionForParFile(ctx, embeddedLauncher, launcherPath, binFile := registerBuildActionForParFile(ctx, embeddedLauncher, launcherPath,
binary.getHostInterpreterName(ctx, actualVersion), 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 := android.GetProtoFlags(ctx, &p.protoProperties)
protoFlags.OutTypeFlag = "--python_out" 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, true)
protosRespectPkgPath := proptools.BoolDefault(p.properties.Proto.Respect_pkg_path, false)
pkgPathForProtos := pkgPath pkgPathForProtos := pkgPath
if pkgPathForProtos != "" && protosRespectPkgPath { if pkgPathForProtos != "" && protosRespectPkgPath {
pkgPathStagingDir := android.PathForModuleGen(ctx, "protos_staged_for_pkg_path") pkgPathStagingDir := android.PathForModuleGen(ctx, "protos_staged_for_pkg_path")