diff options
| -rw-r--r-- | fsgen/filesystem_creator.go | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/fsgen/filesystem_creator.go b/fsgen/filesystem_creator.go index 89db16654..f81589f6d 100644 --- a/fsgen/filesystem_creator.go +++ b/fsgen/filesystem_creator.go @@ -124,10 +124,19 @@ func createFsGenState(ctx android.LoadHookContext) *FsGenState { "public.libraries.android.txt": defaultDepCandidateProps(ctx.Config()), "update_engine_sideload": defaultDepCandidateProps(ctx.Config()), }, - "vendor": newMultilibDeps(), - "odm": newMultilibDeps(), - "product": newMultilibDeps(), - "system_ext": newMultilibDeps(), + "vendor": newMultilibDeps(), + "odm": newMultilibDeps(), + "product": newMultilibDeps(), + "system_ext": &map[string]*depCandidateProps{ + // VNDK apexes are automatically included. + // This hardcoded list will need to be updated if `PRODUCT_EXTRA_VNDK_VERSIONS` is updated. + // https://cs.android.com/android/_/android/platform/build/+/adba533072b00c53ac0f198c550a3cbd7a00e4cd:core/main.mk;l=984;bpv=1;bpt=0;drc=174db7b179592cf07cbfd2adb0119486fda911e7 + "com.android.vndk.v30": defaultDepCandidateProps(ctx.Config()), + "com.android.vndk.v31": defaultDepCandidateProps(ctx.Config()), + "com.android.vndk.v32": defaultDepCandidateProps(ctx.Config()), + "com.android.vndk.v33": defaultDepCandidateProps(ctx.Config()), + "com.android.vndk.v34": defaultDepCandidateProps(ctx.Config()), + }, }, soongGeneratedPartitions: generatedPartitions, fsDepsMutex: sync.Mutex{}, |