diff options
| author | 2021-03-21 11:26:05 +0000 | |
|---|---|---|
| committer | 2021-03-22 18:31:53 +0000 | |
| commit | 70d3bee3e03918cf1225fde603aa54385dba8085 (patch) | |
| tree | 7f036236b781e679da609f9d7a486eac11ba60d9 /apex/apex_test.go | |
| parent | 89648f98faf46f4c9ae2b084167a79f7da2df567 (diff) | |
Remove emptyFixtureFactory from apex and java
Bug: 183235980
Test: m nothing
Change-Id: I350b45e2f57430fb158f4141a566e75de17208cd
Diffstat (limited to 'apex/apex_test.go')
| -rw-r--r-- | apex/apex_test.go | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/apex/apex_test.go b/apex/apex_test.go index 7ef1eaa67..b15966085 100644 --- a/apex/apex_test.go +++ b/apex/apex_test.go @@ -117,8 +117,6 @@ var withUnbundledBuild = android.FixtureModifyProductVariables( }, ) -var emptyFixtureFactory = android.NewFixtureFactory(&buildDir) - var apexFixtureFactory = android.NewFixtureFactory( &buildDir, // General preparers in alphabetical order as test infrastructure will enforce correct @@ -1188,7 +1186,7 @@ var prepareForTestOfRuntimeApexWithHwasan = android.GroupFixturePreparers( ) func TestRuntimeApexShouldInstallHwasanIfLibcDependsOnIt(t *testing.T) { - result := emptyFixtureFactory.Extend(prepareForTestOfRuntimeApexWithHwasan).RunTestWithBp(t, ` + result := android.GroupFixturePreparers(prepareForTestOfRuntimeApexWithHwasan).RunTestWithBp(t, ` cc_library { name: "libc", no_libcrt: true, @@ -1234,7 +1232,7 @@ func TestRuntimeApexShouldInstallHwasanIfLibcDependsOnIt(t *testing.T) { } func TestRuntimeApexShouldInstallHwasanIfHwaddressSanitized(t *testing.T) { - result := emptyFixtureFactory.Extend( + result := android.GroupFixturePreparers( prepareForTestOfRuntimeApexWithHwasan, android.FixtureModifyProductVariables(func(variables android.FixtureProductVariables) { variables.SanitizeDevice = []string{"hwaddress"} |