diff options
Diffstat (limited to 'apex/builder.go')
| -rw-r--r-- | apex/builder.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/apex/builder.go b/apex/builder.go index 4db20e986..371d7d527 100644 --- a/apex/builder.go +++ b/apex/builder.go @@ -1074,8 +1074,9 @@ func (a *apexBundle) getOverrideManifestPackageName(ctx android.ModuleContext) s } return "" } - if a.overridableProperties.Package_name != "" { - return a.overridableProperties.Package_name + packageNameFromProp := a.overridableProperties.Package_name.GetOrDefault(ctx, "") + if packageNameFromProp != "" { + return packageNameFromProp } manifestPackageName, overridden := ctx.DeviceConfig().OverrideManifestPackageNameFor(ctx.ModuleName()) if overridden { |