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:
Jiyong Park 2019-12-02 13:08:53 +09:00
parent 01178ed7d1
commit 3814f4df2b
3 changed files with 4 additions and 4 deletions

View File

@ -151,7 +151,8 @@ func InitDefaultsModule(module DefaultsModule) {
module.AddProperties( module.AddProperties(
&hostAndDeviceProperties{}, &hostAndDeviceProperties{},
commonProperties, commonProperties,
&variableProperties{}) &variableProperties{},
&ApexProperties{})
InitArchModule(module) InitArchModule(module)
InitDefaultableModule(module) InitDefaultableModule(module)

View File

@ -1148,12 +1148,12 @@ func (a *apexBundle) GenerateAndroidBuildActions(ctx android.ModuleContext) {
}) })
// check apex_available requirements // check apex_available requirements
if !ctx.Host() { if !ctx.Host() && !a.testApex {
for _, fi := range filesInfo { for _, fi := range filesInfo {
if am, ok := fi.module.(android.ApexModule); ok { if am, ok := fi.module.(android.ApexModule); ok {
if !am.AvailableFor(ctx.ModuleName()) { if !am.AvailableFor(ctx.ModuleName()) {
ctx.ModuleErrorf("requires %q that is not available for the APEX", fi.module.Name()) 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
} }
} }
} }

View File

@ -2459,7 +2459,6 @@ func DefaultsFactory(props ...interface{}) android.Module {
&PgoProperties{}, &PgoProperties{},
&XomProperties{}, &XomProperties{},
&android.ProtoProperties{}, &android.ProtoProperties{},
&android.ApexProperties{},
) )
android.InitDefaultsModule(module) android.InitDefaultsModule(module)