Merge "Show less ambiguous paths in the error when it fails to match the given output file." am: bacf6a1a6a am: e576120738 am: 868d052099
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1830039
Change-Id: If2b908a03ac5829af3292185d9e3277a20f0103e
diff --git a/android/testing.go b/android/testing.go
index 7a89fc4..b9d8fa8 100644
--- a/android/testing.go
+++ b/android/testing.go
@@ -808,7 +808,7 @@
}
func (b baseTestingComponent) maybeBuildParamsFromOutput(file string) (TestingBuildParams, []string) {
- var searchedOutputs []string
+ searchedOutputs := WritablePaths(nil)
for _, p := range b.provider.BuildParamsForTests() {
outputs := append(WritablePaths(nil), p.Outputs...)
outputs = append(outputs, p.ImplicitOutputs...)
@@ -819,10 +819,17 @@
if f.String() == file || f.Rel() == file || PathRelativeToTop(f) == file {
return b.newTestingBuildParams(p), nil
}
- searchedOutputs = append(searchedOutputs, f.Rel())
+ searchedOutputs = append(searchedOutputs, f)
}
}
- return TestingBuildParams{}, searchedOutputs
+
+ formattedOutputs := []string{}
+ for _, f := range searchedOutputs {
+ formattedOutputs = append(formattedOutputs,
+ fmt.Sprintf("%s (rel=%s)", PathRelativeToTop(f), f.Rel()))
+ }
+
+ return TestingBuildParams{}, formattedOutputs
}
func (b baseTestingComponent) buildParamsFromOutput(file string) TestingBuildParams {