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

4
java/androidmk.go
View File

@@ -235,7 +235,7 @@ func (jd *Javadoc) AndroidMk() android.AndroidMkData {
Include: "$(BUILD_SYSTEM)/soong_java_prebuilt.mk",
Extra: []android.AndroidMkExtraFunc{
func(w io.Writer, outputFile android.Path) {
if jd.properties.Installable == nil || *jd.properties.Installable == true {
if BoolDefault(jd.properties.Installable, true) {
fmt.Fprintln(w, "LOCAL_DROIDDOC_DOC_ZIP := ", jd.docZip.String())
}
if jd.stubsSrcJar != nil {
@@ -253,7 +253,7 @@ func (ddoc *Droiddoc) AndroidMk() android.AndroidMkData {
Include: "$(BUILD_SYSTEM)/soong_java_prebuilt.mk",
Extra: []android.AndroidMkExtraFunc{
func(w io.Writer, outputFile android.Path) {
if ddoc.Javadoc.properties.Installable == nil || *ddoc.Javadoc.properties.Installable == true {
if BoolDefault(ddoc.Javadoc.properties.Installable, true) {
fmt.Fprintln(w, "LOCAL_DROIDDOC_DOC_ZIP := ", ddoc.Javadoc.docZip.String())
}
if ddoc.Javadoc.stubsSrcJar != nil {