StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix stem to be propagated to output jar name in java_library" into main

Browse Source
This commit is contained in:
Jihoon Kang
2023-07-18 18:26:36 +00:00
committed by Gerrit Code Review
parent 66ef2ff97f 1bfb6f231e
commit ef5d8278be
6 changed files with 46 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
java/java.go
View File

@@ -676,6 +676,8 @@ func (j *Library) GenerateAndroidBuildActions(ctx android.ModuleContext) {
j.minSdkVersion = j.MinSdkVersion(ctx)
j.maxSdkVersion = j.MaxSdkVersion(ctx)
j.stem = proptools.StringDefault(j.overridableDeviceProperties.Stem, ctx.ModuleName())
apexInfo := ctx.Provider(android.ApexInfoProvider).(android.ApexInfo)
if !apexInfo.IsForPlatform() {
j.hideApexVariantFromMake = true
@@ -1468,6 +1470,8 @@ func (j *Binary) HostToolPath() android.OptionalPath {
}
func (j *Binary) GenerateAndroidBuildActions(ctx android.ModuleContext) {
j.stem = proptools.StringDefault(j.overridableDeviceProperties.Stem, ctx.ModuleName())
if ctx.Arch().ArchType == android.Common {
// Compile the jar
if j.binaryProperties.Main_class != nil {