summaryrefslogtreecommitdiff
path: root/filesystem/system_image.go
diff options
context:
space:
mode:
author Adam Wright <adamdwright@google.com> 2024-05-01 09:59:21 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2024-05-01 09:59:21 +0000
commit0141b4acad94d7ccffd6fbbce3cba5eae48a9b95 (patch)
tree4401ac8e4a8a9350489d781c99c0ad7ffbbc9721 /filesystem/system_image.go
parent543d4f3b7d7cb403e3c951e0846c9464a32daaf7 (diff)
parent3d65d9cb901a73e63398d31352f3e422d7a68b90 (diff)
Merge changes from topic "revert-3066748-duplicate_entry_fs-CIBDJQYRHU" into main
* changes: Revert "Prevent multiple PackagingSpecs having same installation..." Revert "Filesystem modules follow the installation semantic"
Diffstat (limited to 'filesystem/system_image.go')
-rw-r--r--filesystem/system_image.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/filesystem/system_image.go b/filesystem/system_image.go
index 15cacfb4f..5028a493e 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 s.filesystem.filterInstallablePackagingSpec(ps) && ps.Partition() == "system"
+ return ps.Partition() == "system"
}