commit 1bfb6f231ea98d9ec59a759cf5bb85b250133bc1
author Jihoon Kang <jihoonkang@google.com> Sat Jul 01 00:13:47 2023 +0000
committer Jihoon Kang <jihoonkang@google.com> Fri Jul 14 21:41:46 2023 +0000
tree ee8a8bfcb6226079d6af53104958c569359812c2
parent c38523cd3320cca41f82d664f79a1ae149902465

Fix stem to be propagated to output jar name in java_library

Currently, java_library.stem property is not correctly reflected in the
output jar name in java_library when the module specifies
java_resource_dirs property. This change fixes the unexpected behavior
so that setting the stem property behaves as expected.

Test: go test ./java && m
Bug: 285843207
Change-Id: I0941fcea83c92f4c42ae415aa6ad9125da5cf57b

java/aar.go

diff --git a/java/aar.go b/java/aar.go
index ed3c652..a4f899b 100644
--- a/java/aar.go
+++ b/java/aar.go
@@ -607,6 +607,8 @@
 
 	a.hideApexVariantFromMake = !ctx.Provider(android.ApexInfoProvider).(android.ApexInfo).IsForPlatform()
 
+	a.stem = proptools.StringDefault(a.overridableDeviceProperties.Stem, ctx.ModuleName())
+
 	ctx.CheckbuildFile(a.proguardOptionsFile)
 	ctx.CheckbuildFile(a.exportPackage)
 	ctx.CheckbuildFile(a.aaptSrcJar)