Merge "Remove cross partition modules from provideLibs" into main am: 58aa83815d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3392533
Change-Id: Ibbbec1199fe17f294ce4bfb6d009ae3863746a52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/filesystem/filesystem.go b/filesystem/filesystem.go
index b6b4cb7..d49ac1f 100644
--- a/filesystem/filesystem.go
+++ b/filesystem/filesystem.go
@@ -1012,7 +1012,7 @@
ctx.WalkDeps(func(child, parent android.Module) bool {
for _, ps := range android.OtherModuleProviderOrDefault(
ctx, child, android.InstallFilesProvider).PackagingSpecs {
- if _, ok := deps[ps.RelPathInPackage()]; ok {
+ if _, ok := deps[ps.RelPathInPackage()]; ok && ps.Partition() == f.PartitionType() {
modulesInPackageByModule[child] = true
modulesInPackageByName[child.Name()] = true
return true