Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cb33a009 authored by Colin Cross's avatar Colin Cross
Browse files

Update for sharded globs 

Update the path bootstrap_test.sh uses to check for bpglob reruns
to follow the changes made for sharding globs.

Use bootstrap.GlobFileListFiles to get dependencies during bpbuild.

Test: tests/bootstrap_test.sh
Bug: 159845846
Change-Id: Ibaa7c4360881ed6b666a811bf34b19ea0cdcafe9
parent 9e7cea2c

cmd/soong_build/main.go

+2 −3
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import ( 


	"android/soong/bp2build"

	"android/soong/shared"



	"github.com/google/blueprint/bootstrap"

	"github.com/google/blueprint/deptools"
@@ -389,9 +390,7 @@ func runBp2Build(configuration android.Config, extraNinjaDeps []string) { 
	blueprintArgs := bootstrap.CmdlineArgs

	ninjaDeps := bootstrap.RunBlueprint(blueprintArgs, bp2buildCtx.Context, configuration, extraNinjaDeps...)



	for _, globPath := range bp2buildCtx.Globs() {

		ninjaDeps = append(ninjaDeps, globPath.FileListFile(configuration.BuildDir()))

	}

	ninjaDeps = append(ninjaDeps, bootstrap.GlobFileListFiles(configuration)...)



	depFile := bp2buildMarker + ".d"

	err = deptools.WriteDepFile(shared.JoinPath(topDir, depFile), bp2buildMarker, ninjaDeps)

tests/bootstrap_test.sh

+1 −1
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ EOF 
  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"