Remove emptyFixtureFactory from apex and java

Bug: 183235980
Test: m nothing
Change-Id: I350b45e2f57430fb158f4141a566e75de17208cd
This commit is contained in:
Paul Duffin
2021-03-21 11:26:05 +00:00
parent 89648f98fa
commit 70d3bee3e0
3 changed files with 21 additions and 9 deletions

View File

@@ -48,10 +48,24 @@ func tearDown() {
os.RemoveAll(buildDir)
}
var emptyFixtureFactory = android.NewFixtureFactory(&buildDir)
// Legacy factory to use to create fixtures for tests in this package.
//
// deprecated: See prepareForJavaTest
var javaFixtureFactory = android.NewFixtureFactory(
&buildDir,
prepareForJavaTest,
)
// Factory to use to create fixtures for tests in this package.
var javaFixtureFactory = emptyFixtureFactory.Extend(
// Legacy preparer used for running tests within the java package.
//
// This includes everything that was needed to run any test in the java package prior to the
// introduction of the test fixtures. Tests that are being converted to use fixtures directly
// rather than through the testJava...() methods should avoid using this and instead use the
// various preparers directly, using android.GroupFixturePreparers(...) to group them when
// necessary.
//
// deprecated
var prepareForJavaTest = android.GroupFixturePreparers(
genrule.PrepareForTestWithGenRuleBuildComponents,
// Get the CC build components but not default modules.
cc.PrepareForTestWithCcBuildComponents,