From 0d3fd565f7c9c4f0442b9728fba0e10a023186aa Mon Sep 17 00:00:00 2001 From: Cole Faust Date: Fri, 31 Jan 2025 13:17:58 -0800 Subject: Install apex symbol file This is a partial revert of aosp/3308088. We need the symbol file to still be installed, because a later ctx.InstallSymlink file adds a dependency on the it. We removed that install initially so that it didn't get installed in filesystems, to replace that, just exclude files installed to the "apex" partition from filesystems. Bug: 393617060 Test: cd bionic; mm Change-Id: Id4abe966c630d1e356575386af233eab92849934 --- filesystem/filesystem.go | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'filesystem') diff --git a/filesystem/filesystem.go b/filesystem/filesystem.go index e3f3ce866..660603741 100644 --- a/filesystem/filesystem.go +++ b/filesystem/filesystem.go @@ -469,6 +469,13 @@ func (f *filesystem) FilterPackagingSpec(ps android.PackagingSpec) bool { if ps.SkipInstall() { return false } + // "apex" is a fake partition used to install files in out/target/product//apex/. + // Don't include these files in the partition. We should also look into removing the following + // TODO to check the PackagingSpec's partition against this filesystem's partition for all + // modules, not just autogenerated ones, which will fix this as well. + if ps.Partition() == "apex" { + return false + } if proptools.Bool(f.properties.Is_auto_generated) { // TODO (spandandas): Remove this. pt := f.PartitionType() return ps.Partition() == pt || strings.HasPrefix(ps.Partition(), pt+"/") -- cgit v1.2.3-59-g8ed1b