summaryrefslogtreecommitdiff
path: root/rust/project_json_test.go
diff options
context:
space:
mode:
author Paul Duffin <paulduffin@google.com> 2021-04-01 14:34:02 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2021-04-01 14:34:02 +0000
commit379f36b6e5710f33504d2609a11462643f423d46 (patch)
tree2424d4954c527945877a2b5beb61bcc4eaff0f3c /rust/project_json_test.go
parent6f773143811e74bf8d1a2607399c211d9ca60817 (diff)
parent79abe57f534771027ca77ea01a274d306a82f394 (diff)
Merge changes Idc01d3cc,I644db99c
* changes: Remove FixturePreparer.Extend() Remove FixtureFactory
Diffstat (limited to 'rust/project_json_test.go')
-rw-r--r--rust/project_json_test.go7
1 files changed, 4 insertions, 3 deletions
diff --git a/rust/project_json_test.go b/rust/project_json_test.go
index 7af463528..09d30dbde 100644
--- a/rust/project_json_test.go
+++ b/rust/project_json_test.go
@@ -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