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

Use proptools.BoolDefault

Browse Source 
Replace x == nil || *x with proptools.BoolDefault(x, true)

Test: m checkbuild
Change-Id: Icc5378cab3ea72d86544b40761c2f00b278cc0a1
This commit is contained in:
Colin Cross
2018-04-10 16:14:46 -07:00
parent 47f98af97f
commit 38b40dffd6
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
java/java.go
View File

@@ -1137,7 +1137,7 @@ func (j *Module) minSdkVersionNumber(ctx android.ModuleContext) string {
}
func (j *Module) installable() bool {
return j.properties.Installable == nil || *j.properties.Installable
return BoolDefault(j.properties.Installable, true)
}
var _ Dependency = (*Library)(nil)
@@ -1231,7 +1231,7 @@ type Test struct {
func (j *Test) DepsMutator(ctx android.BottomUpMutatorContext) {
j.deps(ctx)
if j.testProperties.Junit == nil || *j.testProperties.Junit == true {
if BoolDefault(j.testProperties.Junit, true) {
ctx.AddDependency(ctx.Module(), staticLibTag, "junit")
}
}
@@ -1460,5 +1460,6 @@ func DefaultsFactory(props ...interface{}) android.Module {
}
var Bool = proptools.Bool
var BoolDefault = proptools.BoolDefault
var String = proptools.String
var inList = android.InList