Merge "Revert "test_module_config for sh_test"" into main

1 files changed, 8 insertions, 10 deletions

diff --git a/java/java.go b/java/java.go
index 078f578e1..1d572faef 100644
--- a/java/java.go
+++ b/java/java.go
@@ -1557,16 +1557,14 @@ func (j *TestHost) GenerateAndroidBuildActions(ctx android.ModuleContext) {
 
 	j.Test.generateAndroidBuildActionsWithConfig(ctx, configs)
 	android.SetProvider(ctx, tradefed.BaseTestProviderKey, tradefed.BaseTestProviderData{
-		TestcaseRelDataFiles: testcaseRel(j.data),
-		OutputFile:           j.outputFile,
-		TestConfig:           j.testConfig,
-		RequiredModuleNames:  j.RequiredModuleNames(ctx),
-		TestSuites:           j.testProperties.Test_suites,
-		IsHost:               true,
-		LocalSdkVersion:      j.sdkVersion.String(),
-		IsUnitTest:           Bool(j.testProperties.Test_options.Unit_test),
-		MkInclude:            "$(BUILD_SYSTEM)/soong_java_prebuilt.mk",
-		MkAppClass:           "JAVA_LIBRARIES",
+		InstalledFiles:      j.data,
+		OutputFile:          j.outputFile,
+		TestConfig:          j.testConfig,
+		RequiredModuleNames: j.RequiredModuleNames(ctx),
+		TestSuites:          j.testProperties.Test_suites,
+		IsHost:              true,
+		LocalSdkVersion:     j.sdkVersion.String(),
+		IsUnitTest:          Bool(j.testProperties.Test_options.Unit_test),
 	})
 }