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

Commit 14d09018 authored by Colin Cross's avatar Colin Cross Committed by Gerrit Code Review
Browse files

Merge "Update for sharded globs"

parents b8ea9f3c cb33a009

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"
@@ -392,9 +393,7 @@ func runBp2Build(configuration android.Config, extraNinjaDeps []string) { 
	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.

tests/bootstrap_test.sh

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