summaryrefslogtreecommitdiff
path: root/filesystem/system_image.go
diff options
context:
space:
mode:
author Jiyong Park <jiyong@google.com> 2024-04-30 21:25:05 +0900
committer Jiyong Park <jiyong@google.com> 2024-04-30 19:02:57 +0000
commit742f54c4bc32d44cb9c742dbc6c35bd85e7aa395 (patch)
tree228249113b77c5644e037e7662cfab64cef28d38 /filesystem/system_image.go
parenta51c4ce10e959137f2a3a26442438b5a1200ca64 (diff)
Filesystem modules follow the installation semantic
With this change, filesystem modules (android_filesystem, android_system_image, etc.) follow the installation semantic which means output from modules which don't produce installable files (i.e. modules that return false on IsSkipInstall()) are not included in the filesystem module. Note that this bug has been there since the beginning but didn't trigger an error due to another bug (b/335506668) which allowed multiple packaging specs to contribute to the same path. That bug prevented the non-installable variant of a module (e.g. stub) from being installed simply because because it was "luckly" clobbered by the installable variant of the same module (e.g. impl lib). Bug: 335506668 Test: go test ./... Change-Id: I2a42d178701d74bf6ccc5f33ba33918f8c608d40
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 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"
}