Remove FixturePreparer.Extend()

Use GroupFixturePreparers instead.

Bug: 182885307
Test: m nothing
Change-Id: Idc01d3cc5a57576a4cf417e9105d1ab851126e10
This commit is contained in:
Paul Duffin
2021-03-29 02:16:14 +01:00
parent 4814bb814a
commit 79abe57f53
6 changed files with 28 additions and 30 deletions

View File

@@ -28,9 +28,10 @@ import (
// testProjectJson run the generation of rust-project.json. It returns the raw
// content of the generated file.
func testProjectJson(t *testing.T, bp string) []byte {
result := prepareForRustTest.
Extend(android.FixtureMergeEnv(map[string]string{"SOONG_GEN_RUST_PROJECT": "1"})).
RunTestWithBp(t, bp)
result := android.GroupFixturePreparers(
prepareForRustTest,
android.FixtureMergeEnv(map[string]string{"SOONG_GEN_RUST_PROJECT": "1"}),
).RunTestWithBp(t, bp)
// The JSON file is generated via WriteFileToOutputDir. Therefore, it
// won't appear in the Output of the TestingSingleton. Manually verify