diff options
| author | 2024-07-11 15:44:49 +0900 | |
|---|---|---|
| committer | 2024-07-15 17:39:44 +0900 | |
| commit | 33f95a959d5f8acffd63fe31bc7ed675ffb221d7 (patch) | |
| tree | cc2962ba15181fa1e0184032bc38a40fd030e7f1 /filesystem/system_image.go | |
| parent | be6a66d54b326084e8060a4548737059b4ff9349 (diff) | |
Add support installing to root of filesystem image
If the partition of a spec is "root", that spec will be installed to
root instead. Normally that spec will be from prebuilt_root module with
install_in_root property.
Bug: 351258461
Test: USE_SOONG_DEFINED_SYSTEM_IMAGE=true m && cvd start
Change-Id: Iaaa9c2fb8a81fe0ba4710c641e1b65c5b71ad4a4
Diffstat (limited to 'filesystem/system_image.go')
| -rw-r--r-- | filesystem/system_image.go | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/filesystem/system_image.go b/filesystem/system_image.go index 15cacfb4f..69d922df9 100644 --- a/filesystem/system_image.go +++ b/filesystem/system_image.go @@ -94,9 +94,10 @@ func (s *systemImage) buildLinkerConfigFile(ctx android.ModuleContext, root andr return output } -// Filter the result of GatherPackagingSpecs to discard items targeting outside "system" partition. -// Note that "apex" module installs its contents to "apex"(fake partition) as well +// Filter the result of GatherPackagingSpecs to discard items targeting outside "system" / "root" +// partition. Note that "apex" module installs its contents to "apex"(fake partition) as well // for symbol lookup by imitating "activated" paths. func (s *systemImage) filterPackagingSpec(ps android.PackagingSpec) bool { - return s.filesystem.filterInstallablePackagingSpec(ps) && ps.Partition() == "system" + return s.filesystem.filterInstallablePackagingSpec(ps) && + (ps.Partition() == "system" || ps.Partition() == "root") } |