diff options
| -rw-r--r-- | fsgen/Android.bp | 1 | ||||
| -rw-r--r-- | fsgen/filesystem_creator.go | 11 |
2 files changed, 9 insertions, 3 deletions
diff --git a/fsgen/Android.bp b/fsgen/Android.bp index 9fa955779..baf929164 100644 --- a/fsgen/Android.bp +++ b/fsgen/Android.bp @@ -18,6 +18,7 @@ bootstrap_go_package { "filesystem_creator_test.go", ], pluginFor: ["soong_build"], + visibility: ["//visibility:public"], } soong_filesystem_creator { 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): |