Remove usages of FixtureFactory from misc packages

These packages have already been migrated to use per test build
directory so have no need for a FixtureFactory.

Bug: 183235980
Test: m nothing
Change-Id: I667d1d992caaf0f615de91f89efdae11c44986c2
This commit is contained in:
Paul Duffin
2021-03-20 00:36:55 +00:00
parent 30ac3e7ca7
commit 89648f98fa
9 changed files with 47 additions and 56 deletions

View File

@@ -30,8 +30,6 @@ func TestMain(m *testing.M) {
os.Exit(m.Run())
}
var emptyFixtureFactory = android.NewFixtureFactory(nil)
func test(t *testing.T, bp string) *android.TestResult {
t.Helper()
@@ -124,7 +122,7 @@ func test(t *testing.T, bp string) *android.TestResult {
"com/android2/OdmProperties.sysprop": nil,
}
result := emptyFixtureFactory.RunTest(t,
result := android.GroupFixturePreparers(
cc.PrepareForTestWithCcDefaultModules,
java.PrepareForTestWithJavaDefaultModules,
PrepareForTestWithSyspropBuildComponents,
@@ -135,7 +133,7 @@ func test(t *testing.T, bp string) *android.TestResult {
}),
mockFS.AddToFixture(),
android.FixtureWithRootAndroidBp(bp),
)
).RunTest(t)
return result
}