diff options
| author | 2024-10-30 18:53:51 +0000 | |
|---|---|---|
| committer | 2024-11-01 04:32:42 +0000 | |
| commit | 26cfe3c2dfaaff71d6991e457630bee5b5bc6fe9 (patch) | |
| tree | 2d2e19cbf9072ca79e16fdea5d3167043601955b /fsgen/filesystem_creator.go | |
| parent | 79196c55edd59686e2745dccac6269791d77b2d3 (diff) | |
Utilize high_priority_deps in autogenerated filesystem modules
The auto generated prebuilt_* module will be listed in
high_priority_deps property of the auto generated filesystem module if
it is listed in the allowlist. The allowlist is empty in aosp, but will
be extended in internal via a soong plugin.
Test: m nothing
Bug: 375053752
Change-Id: Iaa7291bebf8732f47f8da70421a787dfd275b621
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 766176d5a..61848eb12 100644 --- a/fsgen/filesystem_creator.go +++ b/fsgen/filesystem_creator.go @@ -228,8 +228,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 { @@ -305,12 +306,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): |