From 5c3c3274fe0069a8cd654392d486f3ee821d146d Mon Sep 17 00:00:00 2001 From: Jiyong Park Date: Tue, 30 Apr 2024 21:24:36 +0900 Subject: Remove an unnecessary test in filesystem TestFileSystemShouldInstalCoreVariantIfTargetBuildAppIsSet is removed. The test was originally introduced with aosp/2445946, but the change was effectively reverted by aosp/2562192. The test however has been green as a side effect of a bug (b/335506668) which will be fixed soon. Bug: 335506668 Bug: 268582372 Test: N/A Change-Id: I62f4746c605eba0b2f0037089a53d65922d65ef3 --- filesystem/filesystem_test.go | 37 ------------------------------------- 1 file changed, 37 deletions(-) (limited to 'filesystem/filesystem_test.go') diff --git a/filesystem/filesystem_test.go b/filesystem/filesystem_test.go index 3a5071d34..121504867 100644 --- a/filesystem/filesystem_test.go +++ b/filesystem/filesystem_test.go @@ -299,43 +299,6 @@ func TestAvbAddHashFooter(t *testing.T) { cmd, "--include_descriptors_from_image ") } -func TestFileSystemShouldInstallCoreVariantIfTargetBuildAppsIsSet(t *testing.T) { - context := android.GroupFixturePreparers( - fixture, - android.FixtureModifyProductVariables(func(variables android.FixtureProductVariables) { - variables.Unbundled_build_apps = []string{"bar"} - }), - ) - result := context.RunTestWithBp(t, ` - android_system_image { - name: "myfilesystem", - deps: [ - "libfoo", - ], - linker_config_src: "linker.config.json", - } - - cc_library { - name: "libfoo", - shared_libs: [ - "libbar", - ], - stl: "none", - } - - cc_library { - name: "libbar", - sdk_version: "9", - stl: "none", - } - `) - - inputs := result.ModuleForTests("myfilesystem", "android_common").Output("myfilesystem.img").Implicits - android.AssertStringListContains(t, "filesystem should have libbar even for unbundled build", - inputs.Strings(), - "out/soong/.intermediates/libbar/android_arm64_armv8-a_shared/libbar.so") -} - func TestFileSystemWithCoverageVariants(t *testing.T) { context := android.GroupFixturePreparers( fixture, -- cgit v1.2.3-59-g8ed1b