From 3f4e7a10a604fcd15df4592b7388120ec311c814 Mon Sep 17 00:00:00 2001 From: Julien Desprez Date: Tue, 9 Mar 2021 13:02:29 -0800 Subject: [PATCH] Remove the robolectric heuristic out of java_test Test: presubmit Bug: 180736967 Change-Id: I65193d1639088149d8c2f1d5b7d4311e9f69a609 --- java/java.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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,