Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b216661e authored by Julien Desprez's avatar Julien Desprez
Browse files

Revert "Revert "Attempt to run all java_test_host that look unit..." 

Revert reland the change after tests have been fixed

Reason for revert: relanding after fixes
Reverted Changes:
I89fbce4d7:Revert "Exclude some tests for java_test_host onbo...
Iaa89f9b7e:Revert "Attempt to run all java_test_host that loo...

Change-Id: Idaa80b2d5a8d3ba026e33b453bd163a4e2d31118
parent 1ab84fa4

java/java.go

+6 −0
Original line number Diff line number Diff line
@@ -2505,6 +2505,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)
@@ -2665,6 +2670,7 @@ func TestHostFactory() android.Module { 
	module.Module.properties.Installable = proptools.BoolPtr(true)



	InitJavaModuleMultiTargets(module, android.HostSupported)



	return module

}