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

Commit 68b25945 authored by mrziwang's avatar mrziwang
Browse files

Fix typo in outputFilesForModule error message 

Test: CI
Change-Id: I41f28a0412613458a0dad132006adfbc9fbbce2c
parent 50fe598e

android/module.go

+1 −1
Original line number Diff line number Diff line
@@ -2507,7 +2507,7 @@ func outputFilesForModule(ctx PathContext, module blueprint.Module, tag string) 
		paths := sourceFileProducer.Srcs()

		return paths, nil

	} else {

		return nil, fmt.Errorf("module %q is not an SourceFileProducer or having valid output file for tag %q", pathContextName(ctx, module), tag)

		return nil, fmt.Errorf("module %q is not a SourceFileProducer or having valid output file for tag %q", pathContextName(ctx, module), tag)

	}

}

java/sdk_library_test.go

+3 −3
Original line number Diff line number Diff line
@@ -606,7 +606,7 @@ func TestJavaSdkLibraryImport_AccessOutputFiles_Invalid(t *testing.T) { 


	t.Run("stubs.source", func(t *testing.T) {

		prepareForJavaTest.

			ExtendWithErrorHandler(android.FixtureExpectsAtLeastOneErrorMatchingPattern(`module "foo" is not an SourceFileProducer or having valid output file for tag ".public.stubs.source"`)).

			ExtendWithErrorHandler(android.FixtureExpectsAtLeastOneErrorMatchingPattern(`module "foo" is not a SourceFileProducer or having valid output file for tag ".public.stubs.source"`)).

			RunTestWithBp(t, bp+`

				java_library {

					name: "bar",
@@ -621,7 +621,7 @@ func TestJavaSdkLibraryImport_AccessOutputFiles_Invalid(t *testing.T) { 


	t.Run("api.txt", func(t *testing.T) {

		prepareForJavaTest.

			ExtendWithErrorHandler(android.FixtureExpectsAtLeastOneErrorMatchingPattern(`module "foo" is not an SourceFileProducer or having valid output file for tag ".public.api.txt"`)).

			ExtendWithErrorHandler(android.FixtureExpectsAtLeastOneErrorMatchingPattern(`module "foo" is not a SourceFileProducer or having valid output file for tag ".public.api.txt"`)).

			RunTestWithBp(t, bp+`

				java_library {

					name: "bar",
@@ -635,7 +635,7 @@ func TestJavaSdkLibraryImport_AccessOutputFiles_Invalid(t *testing.T) { 


	t.Run("removed-api.txt", func(t *testing.T) {

		prepareForJavaTest.

			ExtendWithErrorHandler(android.FixtureExpectsAtLeastOneErrorMatchingPattern(`module "foo" is not an SourceFileProducer or having valid output file for tag ".public.removed-api.txt"`)).

			ExtendWithErrorHandler(android.FixtureExpectsAtLeastOneErrorMatchingPattern(`module "foo" is not a SourceFileProducer or having valid output file for tag ".public.removed-api.txt"`)).

			RunTestWithBp(t, bp+`

				java_library {

					name: "bar",