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

Merge "Don't allow tree artifacts in mixed builds" into main am: 096b7e83bc am: afa3c434eb

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2745561

Change-Id: Iea23fed9436d30c419ebe09d7da4161a1519843d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Cole Faust
2023-09-08 19:01:29 +00:00
committed by Automerger Merge Worker
parent 4508832f66 afa3c434eb
commit 0ce68376e5
1 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
bazel/aquery.go
View File

@@ -177,6 +177,21 @@ func newAqueryHandler(aqueryResult *analysis_v2_proto.ActionGraphContainer) (*aq
if err != nil {
return nil, err
}
if artifact.IsTreeArtifact &&
!strings.HasPrefix(artifactPath, "bazel-out/io_bazel_rules_go/") &&
!strings.HasPrefix(artifactPath, "bazel-out/rules_java_builtin/") {
// Since we're using ninja as an executor, we can't use tree artifacts. Ninja only
// considers a file/directory "dirty" when it's mtime changes. Directories' mtimes will
// only change when a file in the directory is added/removed, but not when files in
// the directory are changed, or when files in subdirectories are changed/added/removed.
// Bazel handles this by walking the directory and generating a hash for it after the
// action runs, which we would have to do as well if we wanted to support these
// artifacts in mixed builds.
//
// However, there are some bazel built-in rules that use tree artifacts. Allow those,
// but keep in mind that they'll have incrementality issues.
return nil, fmt.Errorf("tree artifacts are currently not supported in mixed builds: " + artifactPath)
}
artifactIdToPath[artifactId(artifact.Id)] = artifactPath
}