diff options
Diffstat (limited to 'apex/prebuilt.go')
| -rw-r--r-- | apex/prebuilt.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apex/prebuilt.go b/apex/prebuilt.go index afb900afb..8cdfb8974 100644 --- a/apex/prebuilt.go +++ b/apex/prebuilt.go @@ -516,7 +516,7 @@ type ApexFileProperties struct { // This cannot be marked as `android:"arch_variant"` because the `prebuilt_apex` is only mutated // for android_common. That is so that it will have the same arch variant as, and so be compatible // with, the source `apex` module type that it replaces. - Src *string `android:"path"` + Src proptools.Configurable[string] `android:"path,replace_instead_of_append"` Arch struct { Arm struct { Src *string `android:"path"` @@ -566,7 +566,7 @@ func (p *ApexFileProperties) prebuiltApexSelector(ctx android.BaseModuleContext, src = String(p.Arch.X86_64.Src) } if src == "" { - src = String(p.Src) + src = p.Src.GetOrDefault(ctx, "") } if src == "" { |