diff options
Diffstat (limited to 'sdk/testing.go')
| -rw-r--r-- | sdk/testing.go | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sdk/testing.go b/sdk/testing.go index 6df402cff..c319895f5 100644 --- a/sdk/testing.go +++ b/sdk/testing.go @@ -27,8 +27,7 @@ import ( "android/soong/java" ) -var sdkFixtureFactory = android.NewFixtureFactory( - nil, +var prepareForSdkTest = android.GroupFixturePreparers( apex.PrepareForTestWithApexBuildComponents, cc.PrepareForTestWithCcDefaultModules, genrule.PrepareForTestWithGenRuleBuildComponents, @@ -77,12 +76,12 @@ var PrepareForTestWithSdkBuildComponents = android.GroupFixturePreparers( func testSdkWithFs(t *testing.T, bp string, fs android.MockFS) *android.TestResult { t.Helper() - return sdkFixtureFactory.RunTest(t, fs.AddToFixture(), android.FixtureWithRootAndroidBp(bp)) + return prepareForSdkTest.RunTest(t, fs.AddToFixture(), android.FixtureWithRootAndroidBp(bp)) } func testSdkError(t *testing.T, pattern, bp string) { t.Helper() - sdkFixtureFactory. + prepareForSdkTest. ExtendWithErrorHandler(android.FixtureExpectsAtLeastOneErrorMatchingPattern(pattern)). RunTestWithBp(t, bp) } |