From f666b151eb2fcda07f38a76e0dd05dd78aa5d0a7 Mon Sep 17 00:00:00 2001 From: Julien Desprez Date: Mon, 15 Mar 2021 13:07:53 -0700 Subject: Remove tradefed static_lib heuristic Test: presubmit Bug: 180736967 Change-Id: I98b675dec086122e821caae9a9add8758d252724 --- java/java.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'java/java.go') diff --git a/java/java.go b/java/java.go index 036c7afd4..9bcceb3bd 100644 --- a/java/java.go +++ b/java/java.go @@ -2508,7 +2508,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) + defaultUnitTest := !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, -- cgit v1.2.3