diff options
| author | 2024-08-14 17:46:12 -0700 | |
|---|---|---|
| committer | 2024-08-14 17:46:12 -0700 | |
| commit | 642e720b5b13d02b33cab8997a35d4d71996b23f (patch) | |
| tree | cbf16eea7185b4c622dc590d964f67edadd091b1 /apex/prebuilt.go | |
| parent | 08b606153943332075a202450162b02f3eea523a (diff) | |
Support configurable prebuilt apex sources
Bug: 342006386
Fixes: 359690321
Test: m nothing
Change-Id: I2e503932c7fdb3eea9cd2dfedd86029ff52cfbe1
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 20a13c38b..65278c9b1 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 == "" { |