From 38b40dffd62b5f11cff031c8da780144dee03871 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Tue, 10 Apr 2018 16:14:46 -0700 Subject: Use proptools.BoolDefault Replace x == nil || *x with proptools.BoolDefault(x, true) Test: m checkbuild Change-Id: Icc5378cab3ea72d86544b40761c2f00b278cc0a1 --- java/java.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'java/java.go') diff --git a/java/java.go b/java/java.go index fd0719cf3..a2eb810de 100644 --- a/java/java.go +++ b/java/java.go @@ -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 -- cgit v1.2.3-59-g8ed1b