diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2021-03-06 02:00:53 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2021-03-06 02:00:53 +0000 |
| commit | d5e8fcefee56ea65e5a2575e4d0ca0488d472e5d (patch) | |
| tree | 27db1304a08ef6f6d696a10823cad0824483d674 /java/java.go | |
| parent | a25896e624b4c45b429d25e28b4f141c1b09b38a (diff) | |
| parent | 2a2f492ccaaf390950fcf9e8f566fcdeda3547de (diff) | |
Snap for 7188367 from 2a2f492ccaaf390950fcf9e8f566fcdeda3547de to sc-release
Change-Id: If1160f7705c7d4b3796d255c5921cd1ff27a8460
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 } |