Merge "fix: "no_apex" can be put in defaults"

This commit is contained in:
Jooyung Han
2019-09-26 01:07:21 +00:00
committed by Gerrit Code Review
3 changed files with 90 additions and 5 deletions

View File

@@ -552,10 +552,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
@@ -2229,8 +2227,8 @@ func DefaultsFactory(props ...interface{}) android.Module {
&android.ProtoProperties{},
)
android.InitDefaultsModule(module)
android.InitApexModule(module)
android.InitDefaultsModule(module)
return module
}