Use proptools.BoolDefault
Replace x == nil || *x with proptools.BoolDefault(x, true)
Test: m checkbuild
Change-Id: Icc5378cab3ea72d86544b40761c2f00b278cc0a1
diff --git a/cc/library.go b/cc/library.go
index 98a9673..00dc86b 100644
--- a/cc/library.go
+++ b/cc/library.go
@@ -700,13 +700,11 @@
}
func (library *libraryDecorator) buildStatic() bool {
- return library.MutatedProperties.BuildStatic &&
- (library.Properties.Static.Enabled == nil || *library.Properties.Static.Enabled)
+ return library.MutatedProperties.BuildStatic && BoolDefault(library.Properties.Static.Enabled, true)
}
func (library *libraryDecorator) buildShared() bool {
- return library.MutatedProperties.BuildShared &&
- (library.Properties.Shared.Enabled == nil || *library.Properties.Shared.Enabled)
+ return library.MutatedProperties.BuildShared && BoolDefault(library.Properties.Shared.Enabled, true)
}
func (library *libraryDecorator) getWholeStaticMissingDeps() []string {