From ecf667f8ba0b758324d96efd1b9ced37256ad612 Mon Sep 17 00:00:00 2001 From: Spandan Das Date: Thu, 5 Dec 2024 00:58:56 +0000 Subject: Remove cross partition modules from provideLibs provideLibs of a partition is determined by doing a graph walk. This was causing linker.config.pb of vendor to have extraneous entries. Test: /vendor/etc/linker.config.pb is identical between make and soong img Change-Id: I79312083e1848a1f4cc1db1005a18ab887ba6ec0 --- filesystem/filesystem.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'filesystem/filesystem.go') diff --git a/filesystem/filesystem.go b/filesystem/filesystem.go index fbc808936..1eff8d574 100644 --- a/filesystem/filesystem.go +++ b/filesystem/filesystem.go @@ -981,7 +981,7 @@ func (f *filesystem) getLibsForLinkerConfig(ctx android.ModuleContext) ([]androi 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 -- cgit v1.2.3-59-g8ed1b