Ensure that filesystem module can track modules with prefer32
Bug: 321854616
Test: go test ./...
Change-Id: I67893f8c32bd913ec6066e7055e1758a5bddb9a0
diff --git a/filesystem/filesystem_test.go b/filesystem/filesystem_test.go
index 7547ff8..c448105 100644
--- a/filesystem/filesystem_test.go
+++ b/filesystem/filesystem_test.go
@@ -48,20 +48,46 @@
"bpf.o",
],
},
+ lib32: {
+ deps: [
+ "foo",
+ "libbar",
+ ],
+ },
+ lib64: {
+ deps: [
+ "libbar",
+ ],
+ },
},
+ compile_multilib: "both",
}
bpf {
name: "bpf.o",
srcs: ["bpf.c"],
}
+
+ cc_binary {
+ name: "foo",
+ compile_multilib: "prefer32",
+ }
+
+ cc_library {
+ name: "libbar",
+ }
`)
// produces "myfilesystem.img"
result.ModuleForTests("myfilesystem", "android_common").Output("myfilesystem.img")
fs := result.ModuleForTests("myfilesystem", "android_common").Module().(*filesystem)
- expected := []string{"etc/bpf/bpf.o"}
+ expected := []string{
+ "bin/foo",
+ "lib/libbar.so",
+ "lib64/libbar.so",
+ "etc/bpf/bpf.o",
+ }
for _, e := range expected {
android.AssertStringListContains(t, "missing entry", fs.entries, e)
}