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

Fix multiproduct_kati product list

Browse Source 
When the config loading was changed to using AndroidProducts.mk lists
from soong_ui instead of finding them itself, multiproduct_kati stopped
being able to find all the products. Move the finder initialization
earlier so that we can dump the full list.

Test: build/soong/build_test.bash -only-config
Test: forrest runs of every downstream build_test
Change-Id: I085d40f9008a47b850783499365977a0ff70ac66
This commit is contained in:
Dan Willemsen
2018-05-15 00:52:29 -07:00
parent ff9d8911f6
commit 04d76ef47d
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/multiproduct_kati/main.go
View File

@@ -255,6 +255,11 @@ func main() {
setMaxFiles(log) setMaxFiles(log)
finder := build.NewSourceFinder(buildCtx, config)
defer finder.Shutdown()
build.FindSources(buildCtx, config, finder)
vars, err := build.DumpMakeVars(buildCtx, config, nil, []string{"all_named_products"}) vars, err := build.DumpMakeVars(buildCtx, config, nil, []string{"all_named_products"})
if err != nil { if err != nil {
log.Fatal(err) log.Fatal(err)
@@ -303,9 +308,6 @@ func main() {
var wg sync.WaitGroup var wg sync.WaitGroup
productConfigs := make(chan Product, len(products)) productConfigs := make(chan Product, len(products))
finder := build.NewSourceFinder(buildCtx, config)
defer finder.Shutdown()
// Run the product config for every product in parallel // Run the product config for every product in parallel
for _, product := range products { for _, product := range products {
wg.Add(1) wg.Add(1)