diff options
| author | Julien Desprez <jdesprez@google.com> | 2021-03-04 21:50:34 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-03-04 21:50:34 +0000 |
| commit | bbfd5f5e7c60cd4c36425d975d195c764a5b91a8 (patch) | |
| tree | 4a5def13f49f2aeb1f0d0a313c461159cec5de80 /java/java.go | |
| parent | e9d0de4932d446230d6ab7710a7854abbc8f76da (diff) | |
| parent | 1ab84fa433b0094c459d4dd96da33e36e27a30c3 (diff) | |
Merge "Revert "Attempt to run all java_test_host that look unit tests""
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/java/java.go b/java/java.go index b5988fc78..e471f0de6 100644 --- a/java/java.go +++ b/java/java.go @@ -2515,11 +2515,6 @@ 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) - 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) @@ -2680,7 +2675,6 @@ func TestHostFactory() android.Module { module.Module.properties.Installable = proptools.BoolPtr(true) InitJavaModuleMultiTargets(module, android.HostSupported) - return module } |