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

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

Merge "Use java host unit tests template for unit tests"

parents 44e2559f 70898c40

java/java.go

+2 −2
Original line number Diff line number Diff line
@@ -2327,7 +2327,7 @@ func (j *TestHost) DepsMutator(ctx android.BottomUpMutatorContext) { 


func (j *Test) GenerateAndroidBuildActions(ctx android.ModuleContext) {

	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_suites, j.testProperties.Auto_gen_config, j.testProperties.Test_options.Unit_test)



	j.data = android.PathsForModuleSrc(ctx, j.testProperties.Data)
@@ -2346,7 +2346,7 @@ func (j *TestHelperLibrary) GenerateAndroidBuildActions(ctx android.ModuleContex 


func (j *JavaTestImport) GenerateAndroidBuildActions(ctx android.ModuleContext) {

	j.testConfig = tradefed.AutoGenJavaTestConfig(ctx, j.prebuiltTestProperties.Test_config, nil,

		j.prebuiltTestProperties.Test_suites, nil)

		j.prebuiltTestProperties.Test_suites, nil, nil)



	j.Import.GenerateAndroidBuildActions(ctx)

}

tradefed/autogen.go

+6 −2
Original line number Diff line number Diff line
@@ -188,7 +188,7 @@ func AutoGenNativeBenchmarkTestConfig(ctx android.ModuleContext, testConfigProp 
}



func AutoGenJavaTestConfig(ctx android.ModuleContext, testConfigProp *string, testConfigTemplateProp *string,

	testSuites []string, autoGenConfig *bool) android.Path {

	testSuites []string, autoGenConfig *bool, unitTest *bool) android.Path {

	path, autogenPath := testConfigPath(ctx, testConfigProp, testSuites, autoGenConfig, testConfigTemplateProp)

	if autogenPath != nil {

		templatePath := getTestConfigTemplate(ctx, testConfigTemplateProp)
@@ -197,10 +197,14 @@ func AutoGenJavaTestConfig(ctx android.ModuleContext, testConfigProp *string, te 
		} else {

			if ctx.Device() {

				autogenTemplate(ctx, autogenPath, "${JavaTestConfigTemplate}", nil, "")

			} else {

				if Bool(unitTest) {

					autogenTemplate(ctx, autogenPath, "${JavaHostUnitTestConfigTemplate}", nil, "")

				} else {

					autogenTemplate(ctx, autogenPath, "${JavaHostTestConfigTemplate}", nil, "")

				}

			}

		}

		return autogenPath

	}

	return path

tradefed/config.go

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ func init() { 
	pctx.SourcePathVariable("InstrumentationTestConfigTemplate", "build/make/core/instrumentation_test_config_template.xml")

	pctx.SourcePathVariable("JavaTestConfigTemplate", "build/make/core/java_test_config_template.xml")

	pctx.SourcePathVariable("JavaHostTestConfigTemplate", "build/make/core/java_host_test_config_template.xml")

	pctx.SourcePathVariable("JavaHostUnitTestConfigTemplate", "build/make/core/java_host_unit_test_config_template.xml")

	pctx.SourcePathVariable("NativeBenchmarkTestConfigTemplate", "build/make/core/native_benchmark_test_config_template.xml")

	pctx.SourcePathVariable("NativeHostTestConfigTemplate", "build/make/core/native_host_test_config_template.xml")

	pctx.SourcePathVariable("NativeTestConfigTemplate", "build/make/core/native_test_config_template.xml")