diff options
| author | Julien Desprez <jdesprez@google.com> | 2021-03-12 15:40:19 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-03-12 15:40:19 +0000 |
| commit | c001dc6d2f5d218a23fc1d0a9c7637d8c4bb148a (patch) | |
| tree | 3028bc023b336d16c81f762fa80f49e7f28d8834 /java/java.go | |
| parent | f6b5f8217c081030cc276197c24d77ff54c479de (diff) | |
| parent | 3f4e7a10a604fcd15df4592b7388120ec311c814 (diff) | |
Merge "Remove the robolectric heuristic out of java_test"
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/java/java.go b/java/java.go index 9e3583501..ac12cbf9a 100644 --- a/java/java.go +++ b/java/java.go @@ -2499,7 +2499,7 @@ func (j *TestHost) DepsMutator(ctx android.BottomUpMutatorContext) { func (j *Test) GenerateAndroidBuildActions(ctx android.ModuleContext) { if j.testProperties.Test_options.Unit_test == nil && ctx.Host() { // TODO(b/): Clean temporary heuristic to avoid unexpected onboarding. - defaultUnitTest := !inList("tradefed", j.properties.Static_libs) && !inList("tradefed", j.properties.Libs) && !inList("cts", j.testProperties.Test_suites) && !inList("robolectric-host-android_all", j.properties.Static_libs) && !inList("robolectric-host-android_all", j.properties.Libs) + defaultUnitTest := !inList("tradefed", j.properties.Static_libs) && !inList("tradefed", j.properties.Libs) && !inList("cts", j.testProperties.Test_suites) j.testProperties.Test_options.Unit_test = proptools.BoolPtr(defaultUnitTest) } j.testConfig = tradefed.AutoGenJavaTestConfig(ctx, j.testProperties.Test_config, j.testProperties.Test_config_template, |