StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "The type assertion of DefaultableModule as Module is redundant Test: m nothing Bug: n/a" am: 37dd05bbbe am: 1bc4f14604 am: d640edaf69

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1914978

Change-Id: I3ffa0d2eb73f74ff7592a86dcf4b8f02288ce699
This commit is contained in:
Treehugger Robot
2021-12-09 21:39:40 +00:00
committed by Automerger Merge Worker
parent 10ae7770c7 d640edaf69
commit c7c251787c
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
android/defaults.go
View File

@@ -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())