diff options
| author | 2023-07-18 18:26:36 +0000 | |
|---|---|---|
| committer | 2023-07-18 18:26:36 +0000 | |
| commit | ef5d8278be8246ca655e75d5476c9ebb08d744d4 (patch) | |
| tree | be1e0d1b0afe20a6d7eaf703493e1d2de90ace80 /java/java.go | |
| parent | 66ef2ff97f9f6a5fb26de50419cddbfb658530ef (diff) | |
| parent | 1bfb6f231ea98d9ec59a759cf5bb85b250133bc1 (diff) | |
Merge "Fix stem to be propagated to output jar name in java_library" into main
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/java/java.go b/java/java.go index 011dc1c54..e0da4b2a1 100644 --- a/java/java.go +++ b/java/java.go @@ -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 { |