Merge "Attempt to run all java_test_host that look unit tests" (ce45b730) · Commits · e / os / android_build_soong

java/java.go

+6 −0

Original line number	Diff line number	Diff line
		@@ -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
		}