summaryrefslogtreecommitdiff
path: root/java/app.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 /java/app.go
parent25ebc502672abbbe2df0b6efbbc42b5d3983cc69 (diff)
parent65cb40a975fb53187cfc5d9edea905b1f7630ab2 (diff)
Merge "Add new properties to aid in removing the 1-variant fallback" into main
Diffstat (limited to 'java/app.go')
-rw-r--r--java/app.go2
1 files changed, 2 insertions, 0 deletions
diff --git a/java/app.go b/java/app.go
index 67a97ce39..56fcfbba8 100644
--- a/java/app.go
+++ b/java/app.go
@@ -1440,6 +1440,8 @@ func (a *AndroidTest) GenerateAndroidBuildActions(ctx android.ModuleContext) {
a.testConfig = a.FixTestConfig(ctx, testConfig)
a.extraTestConfigs = android.PathsForModuleSrc(ctx, a.testProperties.Test_options.Extra_test_configs)
a.data = android.PathsForModuleSrc(ctx, a.testProperties.Data)
+ a.data = append(a.data, android.PathsForModuleSrc(ctx, a.testProperties.Device_common_data)...)
+ a.data = append(a.data, android.PathsForModuleSrc(ctx, a.testProperties.Device_first_data)...)
android.SetProvider(ctx, testing.TestModuleProviderKey, testing.TestModuleProviderData{})
android.SetProvider(ctx, tradefed.BaseTestProviderKey, tradefed.BaseTestProviderData{
InstalledFiles: a.data,