diff options
| author | 2024-03-26 10:48:27 +0900 | |
|---|---|---|
| committer | 2024-03-29 12:53:32 +0900 | |
| commit | 9c540c82d4efef879589366b808eefc6f8f8fbef (patch) | |
| tree | 37f1821d91140a13466981315b771c9ee17ac120 /filesystem | |
| parent | 92b8e8f1bbf0d3425d1aa9bb010a3e40bbb5854b (diff) | |
fix: required deps of phony modules are correctly tracked
ArchType.Multilib of native modules are either lib32 or lib64.
Arch-neural modules have "" not "common".
Bug: 321626681
Test: go test ./...
Change-Id: Ie7e6a5203e9f671487dbf32ea2343ada7407a28f
Diffstat (limited to 'filesystem')
| -rw-r--r-- | filesystem/Android.bp | 1 | ||||
| -rw-r--r-- | filesystem/filesystem_test.go | 13 |
2 files changed, 14 insertions, 0 deletions
diff --git a/filesystem/Android.bp b/filesystem/Android.bp index cdf668238..cead5fc01 100644 --- a/filesystem/Android.bp +++ b/filesystem/Android.bp @@ -10,6 +10,7 @@ bootstrap_go_package { "soong", "soong-android", "soong-bpf", // for testing + "soong-phony", // for testing "soong-linkerconfig", ], srcs: [ diff --git a/filesystem/filesystem_test.go b/filesystem/filesystem_test.go index 74c79e3bb..d5ea2bc17 100644 --- a/filesystem/filesystem_test.go +++ b/filesystem/filesystem_test.go @@ -23,6 +23,7 @@ import ( "android/soong/bpf" "android/soong/cc" "android/soong/etc" + "android/soong/phony" "github.com/google/blueprint/proptools" ) @@ -36,6 +37,7 @@ var fixture = android.GroupFixturePreparers( bpf.PrepareForTestWithBpf, etc.PrepareForTestWithPrebuiltEtc, cc.PrepareForIntegrationTestWithCc, + phony.PrepareForTestWithPhony, PrepareForTestWithFilesystemBuildComponents, ) @@ -47,6 +49,7 @@ func TestFileSystemDeps(t *testing.T) { common: { deps: [ "bpf.o", + "phony", ], }, lib32: { @@ -82,6 +85,15 @@ func TestFileSystemDeps(t *testing.T) { cc_library { name: "libbaz", } + + phony { + name: "phony", + required: ["libquz"], + } + + cc_library { + name: "libquz", + } `) // produces "myfilesystem.img" @@ -93,6 +105,7 @@ func TestFileSystemDeps(t *testing.T) { "lib/libbar.so", "lib64/libbar.so", "lib64/libbaz.so", + "lib64/libquz.so", "etc/bpf/bpf.o", } for _, e := range expected { |