Merge "Regard out/soong/release-config as a source directory" into main
This commit is contained in:
commit
620b0c46d9
1 changed files with 6 additions and 1 deletions
|
@ -79,6 +79,10 @@ func testForDanglingRules(ctx Context, config Config) {
|
|||
// bpglob is built explicitly using Microfactory
|
||||
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)
|
||||
|
||||
scanner := bufio.NewScanner(stdout)
|
||||
|
@ -93,7 +97,8 @@ func testForDanglingRules(ctx Context, config Config) {
|
|||
line == variablesFilePath ||
|
||||
line == dexpreoptConfigFilePath ||
|
||||
line == buildDatetimeFilePath ||
|
||||
line == bpglob {
|
||||
line == bpglob ||
|
||||
strings.HasPrefix(line, releaseConfigDir) {
|
||||
// Leaf node is in one of Soong's bootstrap directories, which do not have
|
||||
// full build rules in the primary build.ninja file.
|
||||
continue
|
||||
|
|
Loading…
Reference in a new issue