diff options
| author | 2024-09-04 14:16:47 +0900 | |
|---|---|---|
| committer | 2025-02-10 17:04:24 -0800 | |
| commit | 11ad4e940b342fb0bdf700276f9a7b513c3656b0 (patch) | |
| tree | 0a894ae448f961be44c89230cbc4375d8e844e65 /android/module.go | |
| parent | 4fe00974d9ebaf6eaf9e1b6c41c39e290e74cfe9 (diff) | |
Install VINTF fragment modules in the APEX
Currently APEX ignores vintf_fragments modules within the APEX, and all
VINTF fragments are installed with prebuilt_etc modules. This change
installs vintf_fragment modules in the APEX, so any additional
prebuilt_etc modules are not required as long as binaries define
vintf_fragment_modules references.
Bug: 363105686
Test: AOSP CF x86_64 build succeeded
Change-Id: I33b58178cd51dc2c4bb9226fdd68e7990dccd6a2
Merged-In: I33b58178cd51dc2c4bb9226fdd68e7990dccd6a2
Diffstat (limited to 'android/module.go')
| -rw-r--r-- | android/module.go | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/android/module.go b/android/module.go index 80275a309..3295e93be 100644 --- a/android/module.go +++ b/android/module.go @@ -1091,6 +1091,10 @@ var vintfDepTag = struct { InstallAlwaysNeededDependencyTag }{} +func IsVintfDepTag(depTag blueprint.DependencyTag) bool { + return depTag == vintfDepTag +} + func addVintfFragmentDeps(ctx BottomUpMutatorContext) { // Vintf manifests in the recovery partition will be ignored. if !ctx.Device() || ctx.Module().InstallInRecovery() { @@ -1109,7 +1113,7 @@ func addVintfFragmentDeps(ctx BottomUpMutatorContext) { // of nil pointer dereference errors, but we should resolve the missing dependencies. continue } - if vintfModule, ok := vintf.(*vintfFragmentModule); ok { + if vintfModule, ok := vintf.(*VintfFragmentModule); ok { vintfPartition := vintfModule.PartitionTag(deviceConfig) if modPartition != vintfPartition { ctx.ModuleErrorf("Module %q(%q) and Vintf_fragment %q(%q) are installed to different partitions.", |