Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 950689a9 authored by Cole Faust's avatar Cole Faust
Browse files

Handle RepoMappingManifest actions 

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
parent 253054a1

android/bazel_handler.go

+6 −0
Original line number Diff line number Diff line
@@ -1270,6 +1270,12 @@ func (c *bazelSingleton) GenerateBuildActions(ctx SingletonContext) { 
		// because this would cause circular dependency. So, until we move aquery processing

		// to the 'android' package, we need to handle special cases here.

		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":

			out := PathForBazelOut(ctx, buildStatement.OutputPaths[0])

			WriteFileRuleVerbatim(ctx, out, buildStatement.FileContents)

bazel/aquery.go

+1 −1
Original line number Diff line number Diff line
@@ -677,7 +677,7 @@ func (a *aqueryArtifactHandler) actionToBuildStatement(actionEntry *analysis_v2_ 
		if len(actionEntry.Arguments) < 1 {

			return a.templateExpandActionBuildStatement(actionEntry)

		}

	case "FileWrite", "SourceSymlinkManifest":

	case "FileWrite", "SourceSymlinkManifest", "RepoMappingManifest":

		return a.fileWriteActionBuildStatement(actionEntry)

	case "SymlinkTree":

		return a.symlinkTreeActionBuildStatement(actionEntry)