diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2021-03-05 02:00:49 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2021-03-05 02:00:49 +0000 |
| commit | a25896e624b4c45b429d25e28b4f141c1b09b38a (patch) | |
| tree | be3100905a95a1d4695b63024c48dbfd0badee8d /java/java.go | |
| parent | e53e1861485761bdf92609d5bfc7ae41f2620eae (diff) | |
| parent | 4d32bcd77f9fb3c762675120bd67810bcc7060ec (diff) | |
Snap for 7185571 from 4d32bcd77f9fb3c762675120bd67810bcc7060ec to sc-release
Change-Id: I56047b7cb42a0e38210412ac3d74b6a28f8f204d
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/java/java.go b/java/java.go index e471f0de6..b5988fc78 100644 --- a/java/java.go +++ b/java/java.go @@ -2515,6 +2515,11 @@ 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) @@ -2675,6 +2680,7 @@ func TestHostFactory() android.Module { module.Module.properties.Installable = proptools.BoolPtr(true) InitJavaModuleMultiTargets(module, android.HostSupported) + return module } |