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

Commit cb05715e authored by Julien Desprez's avatar Julien Desprez Committed by Gerrit Code Review
Browse files

Merge "Remove tradefed static_lib heuristic"

parents 94820569 f666b151

java/java.go

+1 −1
Original line number Diff line number Diff line
@@ -776,7 +776,7 @@ func (j *TestHost) AddExtraResource(p android.Path) { 
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)

		defaultUnitTest := !inList("tradefed", j.properties.Libs) && !inList("cts", j.testProperties.Test_suites)

		j.testProperties.Test_options.Unit_test = proptools.BoolPtr(defaultUnitTest)

	}

	j.testConfig = tradefed.AutoGenJavaTestConfig(ctx, j.testProperties.Test_config, j.testProperties.Test_config_template,