From de18a3d55a46c5647039f8fe38ff13a9372e7b1b Mon Sep 17 00:00:00 2001 From: Jiyong Park Date: Sat, 13 Apr 2024 10:44:10 +0900 Subject: Use Module interface in addRequiredDeps Previously, addRequiredDeps directly called RequiredModuleNames directly on ModuleBase. As a result, it failed to correctly track the dependencies for the modules which are overriding RequiredModuleNames. cc_* were those. Fixing this by calling RequiredModuleNames via the Module interface. Bug: 321626681 Test: go test ./... under filesystem Change-Id: I79de616606b88277da0b3e86b21316ee83e0ec71 --- filesystem/filesystem_test.go | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'filesystem/filesystem_test.go') diff --git a/filesystem/filesystem_test.go b/filesystem/filesystem_test.go index f4ecad46c..3a5071d34 100644 --- a/filesystem/filesystem_test.go +++ b/filesystem/filesystem_test.go @@ -84,12 +84,21 @@ func TestFileSystemDeps(t *testing.T) { cc_library { name: "libbar", required: ["libbaz"], + target: { + platform: { + required: ["lib_platform_only"], + }, + }, } cc_library { name: "libbaz", } + cc_library { + name: "lib_platform_only", + } + phony { name: "phony", required: [ @@ -120,6 +129,7 @@ func TestFileSystemDeps(t *testing.T) { "lib64/libbar.so", "lib64/libbaz.so", "lib64/libquz.so", + "lib64/lib_platform_only.so", "etc/bpf/bpf.o", } for _, e := range expected { -- cgit v1.2.3-59-g8ed1b