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/app.go
View File

@@ -755,7 +755,7 @@ func (a *AndroidApp) generateAndroidBuildActions(ctx android.ModuleContext) {
// Unlike installApkName, a.stem should respect base module name for override_android_app.
// Therefore, use ctx.ModuleName() instead of a.Name().
a.stem = proptools.StringDefault(a.overridableDeviceProperties.Stem, ctx.ModuleName())
a.stem = proptools.StringDefault(a.overridableProperties.Stem, ctx.ModuleName())
// Check if the install APK name needs to be overridden.
// Both android_app and override_android_app module are expected to possess
@@ -763,7 +763,7 @@ func (a *AndroidApp) generateAndroidBuildActions(ctx android.ModuleContext) {
// from the base module. Therefore, use a.Name() which represents
// the module name for both android_app and override_android_app.
a.installApkName = ctx.DeviceConfig().OverridePackageNameFor(
proptools.StringDefault(a.overridableDeviceProperties.Stem, a.Name()))
proptools.StringDefault(a.overridableProperties.Stem, a.Name()))
if ctx.ModuleName() == "framework-res" {
// framework-res.apk is installed as system/framework/framework-res.apk
@@ -1507,7 +1507,7 @@ func (i *OverrideAndroidApp) GenerateAndroidBuildActions(_ android.ModuleContext
func OverrideAndroidAppModuleFactory() android.Module {
m := &OverrideAndroidApp{}
m.AddProperties(
&OverridableDeviceProperties{},
&OverridableProperties{},
&overridableAppProperties{},
)