Add binary properties to python_defaults and add modern_python_path_defaults

So that we can more easily enable these new flags on several
modules.

It seems you can still apply a python_defaults to a python_library
even with this change, so I didn't break it out into a separate
python_binary_defaults.

Bug: 245583294
Test: m py_dont_import_folder_of_entrypoint_test && out/host/linux-x86/testcases/py_dont_import_folder_of_entrypoint_test/x86_64/py_dont_import_folder_of_entrypoint_test
Change-Id: Iecf9c1845df4630bafdea9957eb2450c15f8596b
This commit is contained in:
Cole Faust
2022-09-26 11:34:11 -07:00
parent eb3a900c5c
commit 40c34500c4
3 changed files with 15 additions and 7 deletions

View File

@@ -27,3 +27,15 @@ bootstrap_go_package {
],
pluginFor: ["soong_build"],
}
// We're transitioning all of these flags to be true by default.
// This is a defaults flag that can be used to easily add all of them to
// certain modules.
python_defaults {
name: "modern_python_path_defaults",
dont_add_top_level_directories_to_path: true,
dont_add_entrypoint_folder_to_path: true,
proto: {
respect_pkg_path: true,
},
}

View File

@@ -31,15 +31,12 @@ func (d *Defaults) GenerateAndroidBuildActions(ctx android.ModuleContext) {
}
func defaultsFactory() android.Module {
return DefaultsFactory()
}
func DefaultsFactory(props ...interface{}) android.Module {
module := &Defaults{}
module.AddProperties(props...)
module.AddProperties(
&BaseProperties{},
&android.ProtoProperties{},
&BinaryProperties{},
)
android.InitDefaultsModule(module)

View File

@@ -5,8 +5,7 @@ python_test_host {
"mypkg/main.py",
"mypkg/mymodule.py",
],
dont_add_entrypoint_folder_to_path: true,
dont_add_top_level_directories_to_path: true,
defaults: ["modern_python_path_defaults"],
}
python_test_host {