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

Commit 9b3724ad authored by Usta Shrestha's avatar Usta Shrestha
Browse files

bootstrap glob file list in one place 

Test: m nothing
Bug: N/A
Change-Id: I2aa4132726b1491db767ccbe695bd98cda08ff50
parent 96ff7227

ui/build/soong.go

+1 −9
Original line number Diff line number Diff line
@@ -312,14 +312,6 @@ func bootstrapBlueprint(ctx Context, config Config) { 
		fmt.Sprintf("generating Soong docs at %s", config.SoongDocsHtml()),

	)



	globFiles := []string{

		config.NamedGlobFile(soongBuildTag),

		config.NamedGlobFile(bp2buildTag),

		config.NamedGlobFile(jsonModuleGraphTag),

		config.NamedGlobFile(queryviewTag),

		config.NamedGlobFile(soongDocsTag),

	}



	// The glob .ninja files are subninja'd. However, they are generated during

	// the build itself so we write an empty file if the file does not exist yet

	// so that the subninja doesn't fail on clean builds
@@ -342,7 +334,7 @@ func bootstrapBlueprint(ctx Context, config Config) { 
		runGoTests:  !config.skipSoongTests,

		// If we want to debug soong_build, we need to compile it for debugging

		debugCompilation: os.Getenv("SOONG_DELVE") != "",

		subninjas:        globFiles,

		subninjas:        bootstrapGlobFileList(config),

		primaryBuilderInvocations: []bootstrap.PrimaryBuilderInvocation{

			mainSoongBuildInvocation,

			bp2buildInvocation,