diff options
Diffstat (limited to 'bazel/aquery.go')
| -rw-r--r-- | bazel/aquery.go | 25 |
1 files changed, 2 insertions, 23 deletions
diff --git a/bazel/aquery.go b/bazel/aquery.go index 186a4945b..2c080a11a 100644 --- a/bazel/aquery.go +++ b/bazel/aquery.go @@ -115,7 +115,6 @@ type BuildStatement struct { // input path string, but not both. InputDepsetHashes []string InputPaths []string - OrderOnlyInputs []string FileContents string // If ShouldRunInSbox is true, Soong will use sbox to created an isolated environment // and run the mixed build action there @@ -138,8 +137,6 @@ type aqueryArtifactHandler struct { depsetHashToArtifactPathsCache sync.Map // Maps artifact ids to fully expanded paths. artifactIdToPath map[artifactId]string - - extraBuildStatements []*BuildStatement } // The tokens should be substituted with the value specified here, instead of the @@ -169,29 +166,13 @@ func newAqueryHandler(aqueryResult *analysis_v2_proto.ActionGraphContainer) (*aq return pathFragmentId(pf.Id) }) - var extraBuildStatements []*BuildStatement artifactIdToPath := make(map[artifactId]string, len(aqueryResult.Artifacts)) for _, artifact := range aqueryResult.Artifacts { artifactPath, err := expandPathFragment(pathFragmentId(artifact.PathFragmentId), pathFragments) if err != nil { return nil, err } - if strings.HasSuffix(artifactPath, "DumpPlatformClassPath.java") { - // TODO(b/291828210): This is a workaround for the fact that DumpPlatformClassPath.java - // has a timestamp in 2033. We'll copy it to a new file using a order-only dep, so that - // the file is not recopied every build. Technically the order-only dep would produce - // incremental build issues if this was a regular file produced as part of the build, - // but this file is actually created by bazel during analysis, so it's not an issue. - outputPath := "hack_for_b291828210/DumpPlatformClassPath.java" - extraBuildStatements = append(extraBuildStatements, &BuildStatement{ - Command: fmt.Sprintf("cp %s %s", artifactPath, outputPath), - OutputPaths: []string{outputPath}, - OrderOnlyInputs: []string{artifactPath}, - }) - artifactIdToPath[artifactId(artifact.Id)] = outputPath - } else { - artifactIdToPath[artifactId(artifact.Id)] = artifactPath - } + artifactIdToPath[artifactId(artifact.Id)] = artifactPath } // Map middleman artifact ContentHash to input artifact depset ID. @@ -218,7 +199,6 @@ func newAqueryHandler(aqueryResult *analysis_v2_proto.ActionGraphContainer) (*aq depsetHashToArtifactPathsCache: sync.Map{}, emptyDepsetIds: make(map[depsetId]struct{}, 0), artifactIdToPath: artifactIdToPath, - extraBuildStatements: extraBuildStatements, } // Validate and adjust aqueryResult.DepSetOfFiles values. @@ -392,7 +372,6 @@ func AqueryBuildStatements(aqueryJsonProto []byte, eventHandler *metrics.EventHa if err != nil { return nil, nil, err } - buildStatements = append(buildStatements, aqueryHandler.extraBuildStatements...) depsetsByHash := map[string]AqueryDepset{} depsets := make([]AqueryDepset, 0, len(aqueryHandler.depsetIdToAqueryDepset)) @@ -480,7 +459,7 @@ func (a *aqueryArtifactHandler) depsetContentHashes(inputDepsetIds []uint32) ([] // escapes the args received from aquery and creates a command string func commandString(actionEntry *analysis_v2_proto.Action) string { switch actionEntry.Mnemonic { - case "GoCompilePkg": + case "GoCompilePkg", "GoStdlib": argsEscaped := []string{} for _, arg := range actionEntry.Arguments { if arg == "" { |