summaryrefslogtreecommitdiff
path: root/rust/test.go
diff options
context:
space:
mode:
author Cole Faust <colefaust@google.com> 2024-10-22 20:40:25 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2024-10-22 20:40:25 +0000
commita9e9f539e8f07e92e737fd9516a8e8e2da4aa8a4 (patch)
tree280cf3f5f7e3c1fa0e984a2d4565eeeb39dce7c4 /rust/test.go
parent25ebc502672abbbe2df0b6efbbc42b5d3983cc69 (diff)
parent65cb40a975fb53187cfc5d9edea905b1f7630ab2 (diff)
Merge "Add new properties to aid in removing the 1-variant fallback" into main
Diffstat (limited to 'rust/test.go')
-rw-r--r--rust/test.go4
1 files changed, 4 insertions, 0 deletions
diff --git a/rust/test.go b/rust/test.go
index b7ddd06a3..20ccfb31c 100644
--- a/rust/test.go
+++ b/rust/test.go
@@ -46,6 +46,9 @@ type TestProperties struct {
// the test
Data []string `android:"path,arch_variant"`
+ // Same as data, but will add dependencies on the device's
+ Device_common_data []string `android:"path_device_common"`
+
// list of shared library modules that should be installed alongside the test
Data_libs []string `android:"arch_variant"`
@@ -143,6 +146,7 @@ func (test *testDecorator) install(ctx ModuleContext) {
})
dataSrcPaths := android.PathsForModuleSrc(ctx, test.Properties.Data)
+ dataSrcPaths = append(dataSrcPaths, android.PathsForModuleSrc(ctx, test.Properties.Device_common_data)...)
ctx.VisitDirectDepsWithTag(dataLibDepTag, func(dep android.Module) {
depName := ctx.OtherModuleName(dep)