tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Update Headers_only to a bool pointer" into main am: 9ea1d061b7 am: 077566faf4 am: 459c689b9d am: 4de5c1d0be

Browse source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2775982

Change-Id: I3a0141cc058747eddf20e470d284f0080de9f909
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot 2023-10-06 20:56:43 +00:00 committed by Automerger Merge Worker
commit dbc400743b
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
java/androidmk.go
View file

@ -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 {

6
java/base.go
View file

@ -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")
}