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

Commit 332310aa authored by Paul Duffin's avatar Paul Duffin Committed by Gerrit Code Review
Browse files

Merge "Improve searching for TestingBuildParams using the output file"

parents b09a2d6a 4e6e35c5

android/testing.go

+3 −3
Original line number Diff line number Diff line
@@ -585,7 +585,7 @@ func (b baseTestingComponent) maybeBuildParamsFromOutput(file string) (TestingBu 
			outputs = append(outputs, p.Output)

		}

		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

			}

			searchedOutputs = append(searchedOutputs, f.Rel())
@@ -597,8 +597,8 @@ func (b baseTestingComponent) maybeBuildParamsFromOutput(file string) (TestingBu 
func (b baseTestingComponent) buildParamsFromOutput(file string) TestingBuildParams {

	p, searchedOutputs := b.maybeBuildParamsFromOutput(file)

	if p.Rule == nil {

		panic(fmt.Errorf("couldn't find output %q.\nall outputs: %v",

			file, searchedOutputs))

		panic(fmt.Errorf("couldn't find output %q.\nall outputs:\n    %s\n",

			file, strings.Join(searchedOutputs, "\n    ")))

	}

	return p

}