Revert "Attempt to run all java_test_host that look unit tests"
Revert submission 1597083-java_test_host_default
Reason for revert: Getting ready for b/181888225 just in case
Reverted Changes:
I220551549:Attempt to run all java_test_host that look unit t...
I29dbbbf46:Exclude some tests for java_test_host onboarding
Change-Id: Iaa89f9b7e9ad72ed962cef285c70a6263e63ffd5
diff --git a/java/java.go b/java/java.go
index f0eeb29..dbfad02 100644
--- a/java/java.go
+++ b/java/java.go
@@ -2505,11 +2505,6 @@
}
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)
- j.testProperties.Test_options.Unit_test = proptools.BoolPtr(defaultUnitTest)
- }
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_options.Unit_test)
@@ -2670,7 +2665,6 @@
module.Module.properties.Installable = proptools.BoolPtr(true)
InitJavaModuleMultiTargets(module, android.HostSupported)
-
return module
}