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:
@@ -26,8 +26,6 @@ func TestMain(m *testing.M) {
|
||||
os.Exit(m.Run())
|
||||
}
|
||||
|
||||
var emptyFixtureFactory = android.NewFixtureFactory(nil)
|
||||
|
||||
func testXml(t *testing.T, bp string) *android.TestResult {
|
||||
fs := android.MockFS{
|
||||
"foo.xml": nil,
|
||||
@@ -37,13 +35,13 @@ func testXml(t *testing.T, bp string) *android.TestResult {
|
||||
"baz.xml": nil,
|
||||
}
|
||||
|
||||
return emptyFixtureFactory.RunTest(t,
|
||||
return android.GroupFixturePreparers(
|
||||
android.PrepareForTestWithArchMutator,
|
||||
etc.PrepareForTestWithPrebuiltEtc,
|
||||
PreparerForTestWithXmlBuildComponents,
|
||||
fs.AddToFixture(),
|
||||
android.FixtureWithRootAndroidBp(bp),
|
||||
)
|
||||
).RunTest(t)
|
||||
}
|
||||
|
||||
// Minimal test
|
||||
|
Reference in New Issue
Block a user