diff options
| author | Julien Desprez <jdesprez@google.com> | 2021-03-04 21:08:36 +0000 |
|---|---|---|
| committer | Julien Desprez <jdesprez@google.com> | 2021-03-04 21:08:36 +0000 |
| commit | 1ab84fa433b0094c459d4dd96da33e36e27a30c3 (patch) | |
| tree | 43ba78f46cb9deb8320df9e1b5f684b206caa44e /java/java.go | |
| parent | 069b75077a072907937f3df00ab2058d69711bd5 (diff) | |
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
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 f0eeb29c8..dbfad029b 100644 --- a/java/java.go +++ b/java/java.go @@ -2505,11 +2505,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) @@ -2670,7 +2665,6 @@ func TestHostFactory() android.Module { module.Module.properties.Installable = proptools.BoolPtr(true) InitJavaModuleMultiTargets(module, android.HostSupported) - return module } |