Merge "The type assertion of DefaultableModule as Module is redundant Test: m nothing Bug: n/a" am: 37dd05bbbe
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1914978 Change-Id: If2dae08811d14d8a549c90a922970b07bf5ab935
This commit is contained in:
@@ -89,10 +89,10 @@ type DefaultableModule interface {
|
|||||||
var _ Defaultable = (*DefaultableModuleBase)(nil)
|
var _ Defaultable = (*DefaultableModuleBase)(nil)
|
||||||
|
|
||||||
func InitDefaultableModule(module DefaultableModule) {
|
func InitDefaultableModule(module DefaultableModule) {
|
||||||
if module.(Module).base().module == nil {
|
if module.base().module == nil {
|
||||||
panic("InitAndroidModule must be called before InitDefaultableModule")
|
panic("InitAndroidModule must be called before InitDefaultableModule")
|
||||||
}
|
}
|
||||||
module.setProperties(module.(Module).GetProperties(), module.(Module).base().variableProperties)
|
module.setProperties(module.GetProperties(), module.base().variableProperties)
|
||||||
|
|
||||||
module.AddProperties(module.defaults())
|
module.AddProperties(module.defaults())
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user