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

Merge "Improve searching for TestingBuildParams using the output file" am: 332310aac4

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

Change-Id: I7c58a078323e2dbe59adc2d92937b06dfadc660c
This commit is contained in:
Paul Duffin
2021-03-23 08:48:43 +00:00
committed by Automerger Merge Worker
parent 9001af1efa 332310aac4
commit 30cb19daa5
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
android/testing.go
View File

@@ -585,7 +585,7 @@ func (b baseTestingComponent) maybeBuildParamsFromOutput(file string) (TestingBu
outputs = append(outputs, p.Output) outputs = append(outputs, p.Output)
} }
for _, f := range outputs { for _, f := range outputs {
if f.String() == file || f.Rel() == file { if f.String() == file || f.Rel() == file || PathRelativeToTop(f) == file {
return b.newTestingBuildParams(p), nil return b.newTestingBuildParams(p), nil
} }
searchedOutputs = append(searchedOutputs, f.Rel()) searchedOutputs = append(searchedOutputs, f.Rel())
@@ -597,8 +597,8 @@ func (b baseTestingComponent) maybeBuildParamsFromOutput(file string) (TestingBu
func (b baseTestingComponent) buildParamsFromOutput(file string) TestingBuildParams { func (b baseTestingComponent) buildParamsFromOutput(file string) TestingBuildParams {
p, searchedOutputs := b.maybeBuildParamsFromOutput(file) p, searchedOutputs := b.maybeBuildParamsFromOutput(file)
if p.Rule == nil { if p.Rule == nil {
panic(fmt.Errorf("couldn't find output %q.\nall outputs: %v", panic(fmt.Errorf("couldn't find output %q.\nall outputs:\n %s\n",
file, searchedOutputs)) file, strings.Join(searchedOutputs, "\n ")))
} }
return p return p
} }