diff options
Diffstat (limited to 'filesystem/filesystem_test.go')
| -rw-r--r-- | filesystem/filesystem_test.go | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/filesystem/filesystem_test.go b/filesystem/filesystem_test.go index 5c780f874..3ce5d4e88 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/java" "android/soong/phony" "github.com/google/blueprint/proptools" @@ -34,9 +35,12 @@ func TestMain(m *testing.M) { var fixture = android.GroupFixturePreparers( android.PrepareForIntegrationTestWithAndroid, + android.PrepareForTestWithAndroidBuildComponents, bpf.PrepareForTestWithBpf, - etc.PrepareForTestWithPrebuiltEtc, cc.PrepareForIntegrationTestWithCc, + etc.PrepareForTestWithPrebuiltEtc, + java.PrepareForTestWithJavaBuildComponents, + java.PrepareForTestWithJavaDefaultModules, phony.PrepareForTestWithPhony, PrepareForTestWithFilesystemBuildComponents, ) @@ -88,12 +92,21 @@ func TestFileSystemDeps(t *testing.T) { phony { name: "phony", - required: ["libquz"], + required: [ + "libquz", + "myapp", + ], } cc_library { name: "libquz", } + + android_app { + name: "myapp", + platform_apis: true, + installable: true, + } `) // produces "myfilesystem.img" @@ -101,6 +114,7 @@ func TestFileSystemDeps(t *testing.T) { fs := result.ModuleForTests("myfilesystem", "android_common").Module().(*filesystem) expected := []string{ + "app/myapp/myapp.apk", "bin/foo", "lib/libbar.so", "lib64/libbar.so", |