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

Commit 620b0c46 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Regard out/soong/release-config as a source directory" into main

parents 86cbd9e4 605b5da1

ui/build/test_build.go

+6 −1
Original line number Original line Diff line number Diff line
@@ -79,6 +79,10 @@ func testForDanglingRules(ctx Context, config Config) { 
	// bpglob is built explicitly using Microfactory

	// bpglob is built explicitly using Microfactory

	bpglob := filepath.Join(config.SoongOutDir(), "bpglob")

	bpglob := filepath.Join(config.SoongOutDir(), "bpglob")





	// release-config files are generated from the initial lunch or Kati phase

	// before running soong and ninja.

	releaseConfigDir := filepath.Join(outDir, "soong", "release-config")



	danglingRules := make(map[string]bool)

	danglingRules := make(map[string]bool)





	scanner := bufio.NewScanner(stdout)

	scanner := bufio.NewScanner(stdout)
@@ -93,7 +97,8 @@ func testForDanglingRules(ctx Context, config Config) { 
			line == variablesFilePath ||

			line == variablesFilePath ||

			line == dexpreoptConfigFilePath ||

			line == dexpreoptConfigFilePath ||

			line == buildDatetimeFilePath ||

			line == buildDatetimeFilePath ||

			line == bpglob {

			line == bpglob ||

			strings.HasPrefix(line, releaseConfigDir) {

			// Leaf node is in one of Soong's bootstrap directories, which do not have

			// Leaf node is in one of Soong's bootstrap directories, which do not have

			// full build rules in the primary build.ninja file.

			// full build rules in the primary build.ninja file.

			continue

			continue