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

Merge "Apex_available check failure reveals dependency" am: 06b362fad7

Browse Source 
Change-Id: Id1b9a86e2f0ffbed4e1e87bff1aaa3bb43a92e87
This commit is contained in:
Automerger Merge Worker
2020-03-09 11:12:14 +00:00
parent bee569c43a 06b362fad7
commit f19e53af01
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apex/apex.go
View File

@@ -2000,7 +2000,7 @@ func (a *apexBundle) checkApexAvailability(ctx android.ModuleContext) {
if externalDep || to.AvailableFor(apexName) || whitelistedApexAvailable(apexName, to) {
return
}
ctx.ModuleErrorf("requires %q that is not available for the APEX.", to.Name())
ctx.ModuleErrorf("%q requires %q that is not available for the APEX.", from.Name(), to.Name())
})
}

2
apex/apex_test.go
View File

@@ -3345,7 +3345,7 @@ func TestApexWithTestHelperApp(t *testing.T) {
func TestApexPropertiesShouldBeDefaultable(t *testing.T) {
// libfoo's apex_available comes from cc_defaults
testApexError(t, `"myapex" .*: requires "libfoo" that is not available for the APEX`, `
testApexError(t, `"myapex" .*: "myapex" requires "libfoo" that is not available for the APEX`, `
apex {
name: "myapex",
key: "myapex.key",