diff options
| author | 2021-01-29 12:48:05 -0500 | |
|---|---|---|
| committer | 2021-01-29 14:31:32 -0500 | |
| commit | 9da4aa8166efe67d6c4ab1fe7911224d94493cc9 (patch) | |
| tree | 655955ac8c4e54abea372e9499c642d00f7c5f50 /cc | |
| parent | 9436be43216d152265187c6d2eece38f9a10a9a7 (diff) | |
rust: Allow rust_tests to include data files.
Adds the ability to define data files that should be installed alongside
the test.
This also fixes a bug wherein rust_test properties were duplicated.
Bug: 171710847
Test: rust_test module with "data" property installs files to device.
Change-Id: I091489afaf7e76b751a33a28049590d9fb39fe5f
Diffstat (limited to 'cc')
| -rw-r--r-- | cc/androidmk.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cc/androidmk.go b/cc/androidmk.go index 040aa0b9f..934572844 100644 --- a/cc/androidmk.go +++ b/cc/androidmk.go @@ -168,7 +168,7 @@ func androidMkWriteExtraTestConfigs(extraTestConfigs android.Paths, entries *and } } -func androidMkWriteTestData(data []android.DataPath, ctx AndroidMkContext, entries *android.AndroidMkEntries) { +func AndroidMkWriteTestData(data []android.DataPath, entries *android.AndroidMkEntries) { testFiles := android.AndroidMkDataPaths(data) if len(testFiles) > 0 { entries.ExtraEntries = append(entries.ExtraEntries, func(entries *android.AndroidMkEntries) { @@ -353,7 +353,7 @@ func (benchmark *benchmarkDecorator) AndroidMkEntries(ctx AndroidMkContext, entr for _, srcPath := range benchmark.data { dataPaths = append(dataPaths, android.DataPath{SrcPath: srcPath}) } - androidMkWriteTestData(dataPaths, ctx, entries) + AndroidMkWriteTestData(dataPaths, entries) } func (test *testBinary) AndroidMkEntries(ctx AndroidMkContext, entries *android.AndroidMkEntries) { @@ -378,7 +378,7 @@ func (test *testBinary) AndroidMkEntries(ctx AndroidMkContext, entries *android. } }) - androidMkWriteTestData(test.data, ctx, entries) + AndroidMkWriteTestData(test.data, entries) androidMkWriteExtraTestConfigs(test.extraTestConfigs, entries) } |