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

Fix some issues in bp2build converter for python_binary_host.

Browse Source 
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
This commit is contained in:
Wei Li
2022-10-11 14:38:16 -07:00
parent 922875d187
commit 7d8f6182f9
5 changed files with 201 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
python/defaults.go
View File

@@ -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(