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

Revert "Enable new python path behavior by default"

Browse Source 
This reverts commit 5fe655d1c7.

Reason for revert: DroidMonitor: Potential culprit for Bug b/251688241 - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.

Change-Id: I1ea4df27557fc891d8f0156ec5681f9b0c601c98
This commit is contained in:
Lais Andrade
2022-10-07 10:09:09 +00:00
parent 5fe655d1c7
commit 4d5cc709fa
2 changed files with 4 additions and 3 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, true) addTopDirectoriesToPath := !proptools.BoolDefault(binary.binaryProperties.Dont_add_top_level_directories_to_path, false)
dontAddEntrypointFolderToPath := proptools.BoolDefault(binary.binaryProperties.Dont_add_entrypoint_folder_to_path, true) dontAddEntrypointFolderToPath := proptools.BoolDefault(binary.binaryProperties.Dont_add_entrypoint_folder_to_path, false)
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,7 +677,8 @@ 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"
protosRespectPkgPath := proptools.BoolDefault(p.properties.Proto.Respect_pkg_path, true) // 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)
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")