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

Remove flags that enable the new python path behavior

Browse Source 
The new behavior has been enabled by default, and these
flags aren't necessary anymore.

Fixes: 245583294
Test: m py_dont_import_folder_of_entrypoint_test && /ssd/aosp-master/out/host/linux-x86/testcases/py_dont_import_folder_of_entrypoint_test/x86_64/py_dont_import_folder_of_entrypoint_test
Change-Id: I5b6f98da51791bc5d28662ef799a10c1bb6a35a0
This commit is contained in:
Cole Faust
2022-10-21 16:07:56 -07:00
parent a9e1df1522
commit caf766b74f
9 changed files with 19 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
python/binary.go
View File

@@ -116,22 +116,6 @@ type BinaryProperties struct {
// doesn't exist next to the Android.bp, this attribute doesn't need to be set to true
// explicitly.
Auto_gen_config *bool
// Currently, both the root of the zipfile and all the directories 1 level
// below that are added to the python path. When this flag is set to true,
// only the root of the zipfile will be added to the python path. This flag
// will be removed after all the python modules in the tree have been updated
// to support it. When using embedded_launcher: true, this is already the
// behavior. The default is currently false.
Dont_add_top_level_directories_to_path *bool
// Setting this to true will mimic Python 3.11+'s PYTHON_SAFE_PATH environment
// variable or -P flag, even on older python versions. This is a temporary
// flag while modules are changed to support it, eventually true will be the
// default and the flag will be removed. The default is currently false. It
// is only applicable when embedded_launcher is false, when embedded_launcher
// is true this is already implied.
Dont_add_entrypoint_folder_to_path *bool
}
type binaryDecorator struct {
@@ -191,14 +175,9 @@ func (binary *binaryDecorator) bootstrap(ctx android.ModuleContext, actualVersio
}
})
}
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),
main, binary.getStem(ctx), append(android.Paths{srcsZip}, depsSrcsZips...),
addTopDirectoriesToPath, dontAddEntrypointFolderToPath)
main, binary.getStem(ctx), append(android.Paths{srcsZip}, depsSrcsZips...))
return android.OptionalPathForPath(binFile)
}