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

Merge "don't touch bp2build_workspace_marker file if it exists"

Browse Source
This commit is contained in:
Usta (Tsering) Shrestha
2022-10-25 13:40:59 +00:00
committed by Gerrit Code Review
parent a3b9688859 5689aa36f6
commit 39f17ad8b8
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
cmd/soong_build/main.go
View File

@@ -519,6 +519,12 @@ func touch(path string) {
}
}
func touchIfDoesNotExist(path string) {
if _, err := os.Stat(path); os.IsNotExist(err) {
touch(path)
}
}
// Find BUILD files in the srcDir which are not in the allowlist
// (android.Bp2BuildConversionAllowlist#ShouldKeepExistingBuildFileForDir)
// and return their paths so they can be left out of the Bazel workspace dir (i.e. ignored)
@@ -674,8 +680,9 @@ func runBp2Build(configuration android.Config, extraNinjaDeps []string) {
writeDepFile(bp2buildMarker, eventHandler, ninjaDeps)
// Create an empty bp2build marker file.
touch(shared.JoinPath(topDir, bp2buildMarker))
// Create an empty bp2build marker file, if it does not already exist.
// Note the relevant rule has `restat = true`
touchIfDoesNotExist(shared.JoinPath(topDir, bp2buildMarker))
})
// Only report metrics when in bp2build mode. The metrics aren't relevant