From 6077263084309070fadcc3be112628fad6e00727 Mon Sep 17 00:00:00 2001 From: Liz Kammer Date: Thu, 5 Oct 2023 17:18:44 -0400 Subject: [PATCH] Update Headers_only to a bool pointer This makes it easier to identify intentionally setting the property Test: m nothing Change-Id: Id89d1e64da3809025f63cafe7557e57a80e0ffee --- java/androidmk.go | 4 +++- java/base.go | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/java/androidmk.go b/java/androidmk.go index b7e2d2ff3..97b303dfb 100644 --- a/java/androidmk.go +++ b/java/androidmk.go @@ -20,6 +20,8 @@ import ( "strings" "android/soong/android" + + "github.com/google/blueprint/proptools" ) func (library *Library) AndroidMkEntriesHostDex() android.AndroidMkEntries { @@ -79,7 +81,7 @@ func (library *Library) AndroidMkEntries() []android.AndroidMkEntries { } else if !library.ApexModuleBase.AvailableFor(android.AvailableToPlatform) { // Platform variant. If not available for the platform, we don't need Make module. entriesList = append(entriesList, android.AndroidMkEntries{Disabled: true}) - } else if library.properties.Headers_only { + } else if proptools.Bool(library.properties.Headers_only) { // If generating headers only then don't expose to Make. entriesList = append(entriesList, android.AndroidMkEntries{Disabled: true}) } else { diff --git a/java/base.go b/java/base.go index ec98dfe46..03198b550 100644 --- a/java/base.go +++ b/java/base.go @@ -194,7 +194,7 @@ type CommonProperties struct { Generated_srcjars []android.Path `android:"mutated"` // If true, then only the headers are built and not the implementation jar. - Headers_only bool + Headers_only *bool } // Properties that are specific to device modules. Host module factories should not add these when @@ -582,7 +582,7 @@ func (j *Module) checkPlatformAPI(ctx android.ModuleContext) { func (j *Module) checkHeadersOnly(ctx android.ModuleContext) { if _, ok := ctx.Module().(android.SdkContext); ok { - headersOnly := proptools.Bool(&j.properties.Headers_only) + headersOnly := proptools.Bool(j.properties.Headers_only) installable := proptools.Bool(j.properties.Installable) if headersOnly && installable { @@ -1180,7 +1180,7 @@ func (j *Module) compile(ctx android.ModuleContext, extraSrcJars, extraClasspath flags.classpath = append(android.CopyOf(extraClasspathJars), flags.classpath...) // If compiling headers then compile them and skip the rest - if j.properties.Headers_only { + if proptools.Bool(j.properties.Headers_only) { if srcFiles.HasExt(".kt") { ctx.ModuleErrorf("Compiling headers_only with .kt not supported") }