diff options
| -rw-r--r-- | apex/apex.go | 2 | ||||
| -rw-r--r-- | apex/apex_test.go | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/apex/apex.go b/apex/apex.go index a9a58a66d..25cd09ddf 100644 --- a/apex/apex.go +++ b/apex/apex.go @@ -2075,7 +2075,7 @@ func (a *apexBundle) checkApexAvailability(ctx android.ModuleContext) { if to.AvailableFor(apexName) || baselineApexAvailable(apexName, toName) { return true } - ctx.ModuleErrorf("%q requires %q that is not available for the APEX. Dependency path:%s", fromName, toName, ctx.GetPathString(true)) + ctx.ModuleErrorf("%q requires %q that doesn't list the APEX under 'apex_available'. Dependency path:%s", fromName, toName, ctx.GetPathString(true)) // Visit this module's dependencies to check and report any issues with their availability. return true }) diff --git a/apex/apex_test.go b/apex/apex_test.go index c52fd0452..38dd46398 100644 --- a/apex/apex_test.go +++ b/apex/apex_test.go @@ -4558,7 +4558,7 @@ func TestApexWithTestHelperApp(t *testing.T) { func TestApexPropertiesShouldBeDefaultable(t *testing.T) { // libfoo's apex_available comes from cc_defaults - testApexError(t, `requires "libfoo" that is not available for the APEX`, ` + testApexError(t, `requires "libfoo" that doesn't list the APEX under 'apex_available'.`, ` apex { name: "myapex", key: "myapex.key", @@ -4592,7 +4592,7 @@ func TestApexPropertiesShouldBeDefaultable(t *testing.T) { func TestApexAvailable_DirectDep(t *testing.T) { // libfoo is not available to myapex, but only to otherapex - testApexError(t, "requires \"libfoo\" that is not available for the APEX", ` + testApexError(t, "requires \"libfoo\" that doesn't list the APEX under 'apex_available'.", ` apex { name: "myapex", key: "myapex.key", @@ -4627,7 +4627,7 @@ func TestApexAvailable_DirectDep(t *testing.T) { func TestApexAvailable_IndirectDep(t *testing.T) { // libbbaz is an indirect dep - testApexError(t, `requires "libbaz" that is not available for the APEX. Dependency path: + testApexError(t, `requires "libbaz" that doesn't list the APEX under 'apex_available'. Dependency path: .*via tag apex\.dependencyTag.*name:sharedLib.* .*-> libfoo.*link:shared.* .*via tag cc\.libraryDependencyTag.*Kind:sharedLibraryDependency.* |