tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Treehugger Robot 2024-06-07 05:12:31 +00:00 committed by Gerrit Code Review
commit 620b0c46d9
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ui/build/test_build.go
View file

@ -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