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

Merge "Change java stem attribute for both device and host" into main

Browse Source
This commit is contained in:
Treehugger Robot
2024-03-20 01:05:50 +00:00
committed by Gerrit Code Review
parent ac45b4bc63 2af0b6edd7
commit 064b145365
6 changed files with 63 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
java/java.go
View File

@@ -901,7 +901,7 @@ func (j *Library) GenerateAndroidBuildActions(ctx android.ModuleContext) {
}
}
j.stem = proptools.StringDefault(j.overridableDeviceProperties.Stem, ctx.ModuleName())
j.stem = proptools.StringDefault(j.overridableProperties.Stem, ctx.ModuleName())
proguardSpecInfo := j.collectProguardSpecInfo(ctx)
android.SetProvider(ctx, ProguardSpecInfoProvider, proguardSpecInfo)
@@ -1698,7 +1698,7 @@ func (j *Binary) HostToolPath() android.OptionalPath {
}
func (j *Binary) GenerateAndroidBuildActions(ctx android.ModuleContext) {
j.stem = proptools.StringDefault(j.overridableDeviceProperties.Stem, ctx.ModuleName())
j.stem = proptools.StringDefault(j.overridableProperties.Stem, ctx.ModuleName())
if ctx.Arch().ArchType == android.Common {
// Compile the jar
@@ -3009,7 +3009,7 @@ func DefaultsFactory() android.Module {
module.AddProperties(
&CommonProperties{},
&DeviceProperties{},
&OverridableDeviceProperties{},
&OverridableProperties{},
&DexProperties{},
&DexpreoptProperties{},
&android.ProtoProperties{},