apex_available is defaultable
Previously, it was defaultable only for cc_library. Now, it is defaultable for all module types. Bug: 128708192 Test: m Change-Id: If248f593da6f4b724bf889ccd7f2e077d48069b5
This commit is contained in:
parent
01178ed7d1
commit
3814f4df2b
|
@ -151,7 +151,8 @@ func InitDefaultsModule(module DefaultsModule) {
|
|||
module.AddProperties(
|
||||
&hostAndDeviceProperties{},
|
||||
commonProperties,
|
||||
&variableProperties{})
|
||||
&variableProperties{},
|
||||
&ApexProperties{})
|
||||
|
||||
InitArchModule(module)
|
||||
InitDefaultableModule(module)
|
||||
|
|
|
@ -1148,12 +1148,12 @@ func (a *apexBundle) GenerateAndroidBuildActions(ctx android.ModuleContext) {
|
|||
})
|
||||
|
||||
// check apex_available requirements
|
||||
if !ctx.Host() {
|
||||
if !ctx.Host() && !a.testApex {
|
||||
for _, fi := range filesInfo {
|
||||
if am, ok := fi.module.(android.ApexModule); ok {
|
||||
if !am.AvailableFor(ctx.ModuleName()) {
|
||||
ctx.ModuleErrorf("requires %q that is not available for the APEX", fi.module.Name())
|
||||
return
|
||||
// don't stop so that we can report other violations in the same run
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue