diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2018-05-15 00:52:29 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@google.com> | 2018-05-15 00:54:25 -0700 |
| commit | 04d76ef47dcb9d0b26b046b9ea1d94acd1a384ca (patch) | |
| tree | e2093fbe8d779b836593588e782bfb62a30a490c /cmd | |
| parent | ff9d8911f68bcfce038d833522d8a41d7f22fe35 (diff) | |
| download | build_soong-04d76ef47dcb9d0b26b046b9ea1d94acd1a384ca.tar.gz build_soong-04d76ef47dcb9d0b26b046b9ea1d94acd1a384ca.tar.bz2 build_soong-04d76ef47dcb9d0b26b046b9ea1d94acd1a384ca.zip | |
Fix multiproduct_kati product list
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
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/multiproduct_kati/main.go | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/cmd/multiproduct_kati/main.go b/cmd/multiproduct_kati/main.go index 06c56264..ab829638 100644 --- a/cmd/multiproduct_kati/main.go +++ b/cmd/multiproduct_kati/main.go @@ -255,6 +255,11 @@ func main() { 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"}) if err != nil { log.Fatal(err) @@ -303,9 +308,6 @@ func main() { var wg sync.WaitGroup productConfigs := make(chan Product, len(products)) - finder := build.NewSourceFinder(buildCtx, config) - defer finder.Shutdown() - // Run the product config for every product in parallel for _, product := range products { wg.Add(1) |