Merge "Update for sharded globs"
diff --git a/cmd/soong_build/main.go b/cmd/soong_build/main.go
index 5bccf58..acf1ac1 100644
--- a/cmd/soong_build/main.go
+++ b/cmd/soong_build/main.go
@@ -25,6 +25,7 @@
"android/soong/bp2build"
"android/soong/shared"
+
"github.com/google/blueprint/bootstrap"
"github.com/google/blueprint/deptools"
@@ -392,9 +393,7 @@
ninjaDeps := bootstrap.RunBlueprint(blueprintArgs, bp2buildCtx.Context, configuration)
ninjaDeps = append(ninjaDeps, extraNinjaDeps...)
- for _, globPath := range bp2buildCtx.Globs() {
- ninjaDeps = append(ninjaDeps, globPath.FileListFile(configuration.BuildDir()))
- }
+ ninjaDeps = append(ninjaDeps, bootstrap.GlobFileListFiles(configuration)...)
// Run the code-generation phase to convert BazelTargetModules to BUILD files
// and print conversion metrics to the user.
diff --git a/tests/bootstrap_test.sh b/tests/bootstrap_test.sh
index e45df06..8da398a 100755
--- a/tests/bootstrap_test.sh
+++ b/tests/bootstrap_test.sh
@@ -140,7 +140,7 @@
run_soong
local ninja_mtime1=$(stat -c "%y" out/soong/build.ninja)
- local glob_deps_file=out/soong/.glob/a/__py.glob.d
+ local glob_deps_file=out/soong/.primary/globs/0.d
if [ -e "$glob_deps_file" ]; then
fail "Glob deps file unexpectedly written on first build"