diff options
| author | 2024-11-16 00:19:36 +0000 | |
|---|---|---|
| committer | 2024-11-16 00:19:36 +0000 | |
| commit | fb9cd1703bd3edb381400e4b8678060def78d5fe (patch) | |
| tree | 97bb989f42c3ca05e09f3f5b05d78b1088ad7ce9 /java/base.go | |
| parent | 984de3e496ed30595990879629b6b10918d4f10f (diff) | |
| parent | 5146e78cbcee8ee9f8b82acfc517fcb4638c807c (diff) | |
Merge "Deny nil outputpaths" into main
Diffstat (limited to 'java/base.go')
| -rw-r--r-- | java/base.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/java/base.go b/java/base.go index 7630ca5d5..427c28c52 100644 --- a/java/base.go +++ b/java/base.go @@ -714,10 +714,10 @@ func (j *Module) provideHiddenAPIPropertyInfo(ctx android.ModuleContext) { // helper method for java modules to set OutputFilesProvider func setOutputFiles(ctx android.ModuleContext, m Module) { - ctx.SetOutputFiles(append(android.Paths{m.outputFile}, m.extraOutputFiles...), "") - ctx.SetOutputFiles(android.Paths{m.outputFile}, android.DefaultDistTag) - ctx.SetOutputFiles(android.Paths{m.implementationAndResourcesJar}, ".jar") - ctx.SetOutputFiles(android.Paths{m.headerJarFile}, ".hjar") + ctx.SetOutputFiles(append(android.PathsIfNonNil(m.outputFile), m.extraOutputFiles...), "") + ctx.SetOutputFiles(android.PathsIfNonNil(m.outputFile), android.DefaultDistTag) + ctx.SetOutputFiles(android.PathsIfNonNil(m.implementationAndResourcesJar), ".jar") + ctx.SetOutputFiles(android.PathsIfNonNil(m.headerJarFile), ".hjar") if m.dexer.proguardDictionary.Valid() { ctx.SetOutputFiles(android.Paths{m.dexer.proguardDictionary.Path()}, ".proguard_map") } |