diff options
| author | 2024-05-01 02:43:23 +0000 | |
|---|---|---|
| committer | 2024-05-01 02:43:23 +0000 | |
| commit | 543d4f3b7d7cb403e3c951e0846c9464a32daaf7 (patch) | |
| tree | e1849eb51f439c3b81dc58d07c4be30aea621bf9 /filesystem/system_image.go | |
| parent | 6ab1b1fd031f95ee129563c02484a1285662f536 (diff) | |
| parent | 742f54c4bc32d44cb9c742dbc6c35bd85e7aa395 (diff) | |
Merge changes from topic "duplicate_entry_fs" into main
* changes:
Filesystem modules follow the installation semantic
Prevent multiple PackagingSpecs having same installation path
Diffstat (limited to 'filesystem/system_image.go')
| -rw-r--r-- | filesystem/system_image.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/filesystem/system_image.go b/filesystem/system_image.go index 5028a493e..15cacfb4f 100644 --- a/filesystem/system_image.go +++ b/filesystem/system_image.go @@ -98,5 +98,5 @@ func (s *systemImage) buildLinkerConfigFile(ctx android.ModuleContext, root andr // 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 ps.Partition() == "system" + return s.filesystem.filterInstallablePackagingSpec(ps) && ps.Partition() == "system" } |