diff options
| author | 2024-03-20 01:05:50 +0000 | |
|---|---|---|
| committer | 2024-03-20 01:05:50 +0000 | |
| commit | 064b1453658a76b9bd63a9a7f1918723bd6f467a (patch) | |
| tree | 14726e276524e4732fd7a0aae69ac498ad6ec49c /java/java.go | |
| parent | ac45b4bc6377b9082b11507020be903345e59f5a (diff) | |
| parent | 2af0b6edd70d2c92e10fc862ced000fe8068a804 (diff) | |
Merge "Change java stem attribute for both device and host" into main
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/java/java.go b/java/java.go index 645283fb7..ad10cbd77 100644 --- a/java/java.go +++ b/java/java.go @@ -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{}, |