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

Handle RepoMappingManifest actions

Browse Source 
These are essentially FileWrite actions, like SourceSymlinkManifest.

However, currently aquery appears to give non-deterministic results
for the file content. Emit an empty file for now to avoid the
non-determinism.

Fixes: 288292933
Bug: 287539324
Test: Presubmits
Change-Id: Ieaf8aff0d58d2d69087e4e34dc99074a015e700c
This commit is contained in:
Cole Faust
2023-06-21 15:07:21 -07:00
parent 253054a175
commit 950689a9c2
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
android/bazel_handler.go
View File

@@ -1270,6 +1270,12 @@ func (c *bazelSingleton) GenerateBuildActions(ctx SingletonContext) {
// because this would cause circular dependency. So, until we move aquery processing // because this would cause circular dependency. So, until we move aquery processing
// to the 'android' package, we need to handle special cases here. // to the 'android' package, we need to handle special cases here.
switch buildStatement.Mnemonic { switch buildStatement.Mnemonic {
case "RepoMappingManifest":
// It appears RepoMappingManifest files currently have
// non-deterministic content. Just emit empty files for
// now because they're unused.
out := PathForBazelOut(ctx, buildStatement.OutputPaths[0])
WriteFileRuleVerbatim(ctx, out, "")
case "FileWrite", "SourceSymlinkManifest": case "FileWrite", "SourceSymlinkManifest":
out := PathForBazelOut(ctx, buildStatement.OutputPaths[0]) out := PathForBazelOut(ctx, buildStatement.OutputPaths[0])
WriteFileRuleVerbatim(ctx, out, buildStatement.FileContents) WriteFileRuleVerbatim(ctx, out, buildStatement.FileContents)

2
bazel/aquery.go
View File

@@ -677,7 +677,7 @@ func (a *aqueryArtifactHandler) actionToBuildStatement(actionEntry *analysis_v2_
if len(actionEntry.Arguments) < 1 { if len(actionEntry.Arguments) < 1 {
return a.templateExpandActionBuildStatement(actionEntry) return a.templateExpandActionBuildStatement(actionEntry)
} }
case "FileWrite", "SourceSymlinkManifest": case "FileWrite", "SourceSymlinkManifest", "RepoMappingManifest":
return a.fileWriteActionBuildStatement(actionEntry) return a.fileWriteActionBuildStatement(actionEntry)
case "SymlinkTree": case "SymlinkTree":
return a.symlinkTreeActionBuildStatement(actionEntry) return a.symlinkTreeActionBuildStatement(actionEntry)