summaryrefslogtreecommitdiff
path: root/java/java.go
diff options
context:
space:
mode:
author Julien Desprez <jdesprez@google.com> 2020-11-19 09:43:45 -0800
committer Julien Desprez <jdesprez@google.com> 2020-11-19 09:44:39 -0800
commit70898c4006c89c1fe67251a0a4f2aa9c0eede22f (patch)
treefd3234ab24d4c34e0d93cbe2f3203487cca1bc98 /java/java.go
parent7a64f7e5b61f4e0c784c46eb94086523bb987222 (diff)
Use java host unit tests template for unit tests
Test: make aoa-helper-tests Bug: 172961860 Change-Id: I2eaee277961f29adfd22e7c65248c9403bd69b81
Diffstat (limited to 'java/java.go')
-rw-r--r--java/java.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/java/java.go b/java/java.go
index a23c649c1..76f9ba2a6 100644
--- a/java/java.go
+++ b/java/java.go
@@ -2325,7 +2325,7 @@ func (j *TestHost) DepsMutator(ctx android.BottomUpMutatorContext) {
func (j *Test) GenerateAndroidBuildActions(ctx android.ModuleContext) {
j.testConfig = tradefed.AutoGenJavaTestConfig(ctx, j.testProperties.Test_config, j.testProperties.Test_config_template,
- j.testProperties.Test_suites, j.testProperties.Auto_gen_config)
+ j.testProperties.Test_suites, j.testProperties.Auto_gen_config, j.testProperties.Test_options.Unit_test)
j.data = android.PathsForModuleSrc(ctx, j.testProperties.Data)
@@ -2344,7 +2344,7 @@ func (j *TestHelperLibrary) GenerateAndroidBuildActions(ctx android.ModuleContex
func (j *JavaTestImport) GenerateAndroidBuildActions(ctx android.ModuleContext) {
j.testConfig = tradefed.AutoGenJavaTestConfig(ctx, j.prebuiltTestProperties.Test_config, nil,
- j.prebuiltTestProperties.Test_suites, nil)
+ j.prebuiltTestProperties.Test_suites, nil, nil)
j.Import.GenerateAndroidBuildActions(ctx)
}