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

Merge "apex dependency error: note 'apex_available'"

Browse Source
This commit is contained in:
Steven Moreland
2020-10-22 23:08:18 +00:00
committed by Gerrit Code Review
parent 5ac5247c26 6e36cd6104
commit 8f01ff814b
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apex/apex.go
View File

@@ -2075,7 +2075,7 @@ func (a *apexBundle) checkApexAvailability(ctx android.ModuleContext) {
if to.AvailableFor(apexName) || baselineApexAvailable(apexName, toName) { if to.AvailableFor(apexName) || baselineApexAvailable(apexName, toName) {
return true 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. // Visit this module's dependencies to check and report any issues with their availability.
return true return true
}) })

6
apex/apex_test.go
View File

@@ -4558,7 +4558,7 @@ func TestApexWithTestHelperApp(t *testing.T) {
func TestApexPropertiesShouldBeDefaultable(t *testing.T) { func TestApexPropertiesShouldBeDefaultable(t *testing.T) {
// libfoo's apex_available comes from cc_defaults // 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 { apex {
name: "myapex", name: "myapex",
key: "myapex.key", key: "myapex.key",
@@ -4592,7 +4592,7 @@ func TestApexPropertiesShouldBeDefaultable(t *testing.T) {
func TestApexAvailable_DirectDep(t *testing.T) { func TestApexAvailable_DirectDep(t *testing.T) {
// libfoo is not available to myapex, but only to otherapex // 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 { apex {
name: "myapex", name: "myapex",
key: "myapex.key", key: "myapex.key",
@@ -4627,7 +4627,7 @@ func TestApexAvailable_DirectDep(t *testing.T) {
func TestApexAvailable_IndirectDep(t *testing.T) { func TestApexAvailable_IndirectDep(t *testing.T) {
// libbbaz is an indirect dep // 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.* .*via tag apex\.dependencyTag.*name:sharedLib.*
.*-> libfoo.*link:shared.* .*-> libfoo.*link:shared.*
.*via tag cc\.libraryDependencyTag.*Kind:sharedLibraryDependency.* .*via tag cc\.libraryDependencyTag.*Kind:sharedLibraryDependency.*