summaryrefslogtreecommitdiff
path: root/apex/builder.go
diff options
context:
space:
mode:
author Cole Faust <colefaust@google.com> 2024-10-03 13:32:43 -0700
committer Cole Faust <colefaust@google.com> 2024-10-03 13:32:43 -0700
commit12f6ec9b37d264a81986f1f2926fe416730f77d0 (patch)
tree4cb48ac5292997b21d4e9eed70633693243055a2 /apex/builder.go
parent7fb4e6ca6573cd49439909910793eb9399b1a769 (diff)
Make the package_name property configurable
Requested by a user. Fixes: 371213057 Test: m nothing --no-skip-soong-tests Change-Id: I4268257b03d632f068c38a572896582cddb81ecd
Diffstat (limited to 'apex/builder.go')
-rw-r--r--apex/builder.go5
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 {