openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Apex_available check failure reveals dependency" into rvc-dev am: 5a3899b5c5 

Change-Id: I683d10496836a77d5140031daae27ac71a83c76f
This commit is contained in:
Automerger Merge Worker 2020-03-09 09:01:38 +00:00
parent 59756d77a2 5a3899b5c5
commit 62cdc4ad57
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apex/apex.go
View File

@ -1998,7 +1998,7 @@ func (a *apexBundle) checkApexAvailability(ctx android.ModuleContext) {
if externalDep || to.AvailableFor(apexName) || whitelistedApexAvailable(apexName, to) { if externalDep || to.AvailableFor(apexName) || whitelistedApexAvailable(apexName, to) {
return 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) { func TestApexPropertiesShouldBeDefaultable(t *testing.T) {
// libfoo's apex_available comes from cc_defaults // 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 { apex {
name: "myapex", name: "myapex",
key: "myapex.key", key: "myapex.key",