diff options
| author | 2024-11-01 17:22:45 +0000 | |
|---|---|---|
| committer | 2024-11-01 17:22:45 +0000 | |
| commit | f5755e177aeea22f80b46e3b5597ae98a87acfcf (patch) | |
| tree | d6513f39a0deb4e683cb6db43bad89f2b418c6d6 /fsgen/filesystem_creator.go | |
| parent | 3c602d1711a556f065d1c731d77ebb769d1f1d93 (diff) | |
| parent | 26cfe3c2dfaaff71d6991e457630bee5b5bc6fe9 (diff) | |
Merge "Utilize high_priority_deps in autogenerated filesystem modules" into main
Diffstat (limited to 'fsgen/filesystem_creator.go')
| -rw-r--r-- | fsgen/filesystem_creator.go | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/fsgen/filesystem_creator.go b/fsgen/filesystem_creator.go index bf5dfd92c..f519960b1 100644 --- a/fsgen/filesystem_creator.go +++ b/fsgen/filesystem_creator.go @@ -229,8 +229,9 @@ type multilibDepsStruct struct { } type packagingPropsStruct struct { - Deps []string - Multilib multilibDepsStruct + High_priority_deps []string + Deps []string + Multilib multilibDepsStruct } func fullyQualifiedModuleName(moduleName, namespace string) string { @@ -306,12 +307,16 @@ func removeOverriddenDeps(mctx android.BottomUpMutatorContext) { }) } +var HighPriorityDeps = []string{} + func generateDepStruct(deps map[string]*depCandidateProps) *packagingPropsStruct { depsStruct := packagingPropsStruct{} for depName, depProps := range deps { bitness := getBitness(depProps.Arch) fullyQualifiedDepName := fullyQualifiedModuleName(depName, depProps.Namespace) - if android.InList("32", bitness) && android.InList("64", bitness) { + if android.InList(depName, HighPriorityDeps) { + depsStruct.High_priority_deps = append(depsStruct.High_priority_deps, fullyQualifiedDepName) + } else if android.InList("32", bitness) && android.InList("64", bitness) { // If both 32 and 64 bit variants are enabled for this module switch depProps.Multilib { case string(android.MultilibBoth): |