diff options
| author | Julien Desprez <jdesprez@google.com> | 2020-11-20 00:07:41 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-11-20 00:07:41 +0000 |
| commit | 62aa21508c218b1e67005e53d7f6182efa18e72c (patch) | |
| tree | 6d65cf1c6b3c9f85fadec5a60592f30aea7652a2 /java/java.go | |
| parent | 44e2559f0f030bff034fe6cc035e49f01fd8c5aa (diff) | |
| parent | 70898c4006c89c1fe67251a0a4f2aa9c0eede22f (diff) | |
Merge "Use java host unit tests template for unit tests"
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/java/java.go b/java/java.go index 0739eab04..fc8a21f81 100644 --- a/java/java.go +++ b/java/java.go @@ -2327,7 +2327,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) @@ -2346,7 +2346,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) } |