StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Make bgplob an exception to dangling rule check."

Browse Source
This commit is contained in:
Lukács T. Berki
2021-11-10 17:19:44 +00:00
committed by Gerrit Code Review
parent 8a709b149b 5a67da789d
commit 9303cd6f87
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ui/build/test_build.go
View File

@@ -76,6 +76,9 @@ func testForDanglingRules(ctx Context, config Config) {
// out/build_date.txt is considered a "source file" // out/build_date.txt is considered a "source file"
buildDatetimeFilePath := filepath.Join(outDir, "build_date.txt") buildDatetimeFilePath := filepath.Join(outDir, "build_date.txt")
// bpglob is built explicitly using Microfactory
bpglob := filepath.Join(config.SoongOutDir(), "bpglob")
danglingRules := make(map[string]bool) danglingRules := make(map[string]bool)
scanner := bufio.NewScanner(stdout) scanner := bufio.NewScanner(stdout)
@@ -88,7 +91,8 @@ func testForDanglingRules(ctx Context, config Config) {
if strings.HasPrefix(line, modulePathsDir) || if strings.HasPrefix(line, modulePathsDir) ||
line == variablesFilePath || line == variablesFilePath ||
line == dexpreoptConfigFilePath || line == dexpreoptConfigFilePath ||
line == buildDatetimeFilePath { line == buildDatetimeFilePath ||
line == bpglob {
// 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