From 68b259452459bd0ea8a30c3e5e74cef23cd0dc16 Mon Sep 17 00:00:00 2001 From: mrziwang Date: Thu, 11 Jul 2024 09:58:30 -0700 Subject: [PATCH] Fix typo in outputFilesForModule error message Test: CI Change-Id: I41f28a0412613458a0dad132006adfbc9fbbce2c --- android/module.go | 2 +- java/sdk_library_test.go | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/android/module.go b/android/module.go index 2fe822f26..4a6f5d1d9 100644 --- a/android/module.go +++ b/android/module.go @@ -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) } } diff --git a/java/sdk_library_test.go b/java/sdk_library_test.go index cf1a6e1e3..a8a1494ee 100644 --- a/java/sdk_library_test.go +++ b/java/sdk_library_test.go @@ -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",