fix: "no_apex" can be put in defaults

Currently, putting no_apex in defaults module doesn't work.

To fix this,
* 'no_apex' property is added as 'defaultable'.
* apex module doesn't follow beyond 'defaults' module.

Bug: 141560644
Test: m (soong tests added)
Change-Id: I8410785f7f83d843689a33b1241d74086c6a7671
This commit is contained in:
Jooyung Han
2019-09-25 15:18:44 +09:00
parent ec3e81b4be
commit cc372c5b1d
3 changed files with 90 additions and 5 deletions

View File

@@ -544,10 +544,8 @@ func (c *Module) Init() android.Module {
}
})
android.InitAndroidArchModule(c, c.hod, c.multilib)
android.InitDefaultableModule(c)
android.InitApexModule(c)
android.InitDefaultableModule(c)
android.InitSdkAwareModule(c)
return c
@@ -2221,8 +2219,8 @@ func DefaultsFactory(props ...interface{}) android.Module {
&android.ProtoProperties{},
)
android.InitDefaultsModule(module)
android.InitApexModule(module)
android.InitDefaultsModule(module)
return module
}