diff options
| author | 2022-10-11 14:38:16 -0700 | |
|---|---|---|
| committer | 2022-10-12 17:43:20 -0700 | |
| commit | 7d8f6182f9fb6cab1e292ea767dd2410726ac7dd (patch) | |
| tree | 4131804475e4fc6e1b00b17f0506d6579d38d1bf /python/defaults.go | |
| parent | 922875d1870ce4fbab6b01394960d2ab4e285f6f (diff) | |
Fix some issues in bp2build converter for python_binary_host.
1) Bp2build convert python_binary_host main attribute as LabelAttribute. Currently "main" attribute in python_binary_host is handled as string but for some modules (e.g certify_bootimg) the "main" attribute points to a file in its subpackage like "subpackage/file.py" and should be converted to "//.../subpackage:file.py".
2) Filter out duplicated labels in the merged list of "required" attributes of python_binary_host and its defaults.
Test: b build //system/tools/mkbootimg:certify_bootimg
Test: b build //build/make/tools/releasetools:check_target_files_signatures
Bug: 253081249
Bug: 253101186
Change-Id: Ic2cb4cadec2c1348da70af9f0730da9914d3a8ca
Diffstat (limited to 'python/defaults.go')
| -rw-r--r-- | python/defaults.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/python/defaults.go b/python/defaults.go index c54e7d059..3dc5bc4d2 100644 --- a/python/defaults.go +++ b/python/defaults.go @@ -19,7 +19,7 @@ import ( ) func init() { - android.RegisterModuleType("python_defaults", defaultsFactory) + android.RegisterModuleType("python_defaults", DefaultsFactory) } type Defaults struct { @@ -30,7 +30,7 @@ type Defaults struct { func (d *Defaults) GenerateAndroidBuildActions(ctx android.ModuleContext) { } -func defaultsFactory() android.Module { +func DefaultsFactory() android.Module { module := &Defaults{} module.AddProperties( |