Revert "test_module_config for sh_test"
This reverts commit 45dca5c8cc538392edbde4ee1077fc86509b2e38.
Reason for revert: DroidMonitor: Potential culprit for http://b/377964351 - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.
Change-Id: Idd5e4b0d04b3c04dc1cfc4541615fc5f42a85c3e
diff --git a/java/app.go b/java/app.go
index 5f43326..e01a2ba 100644
--- a/java/app.go
+++ b/java/app.go
@@ -1442,9 +1442,8 @@
a.data = append(a.data, android.PathsForModuleSrc(ctx, a.testProperties.Device_common_data)...)
a.data = append(a.data, android.PathsForModuleSrc(ctx, a.testProperties.Device_first_data)...)
a.data = append(a.data, android.PathsForModuleSrc(ctx, a.testProperties.Device_first_prefer32_data)...)
-
android.SetProvider(ctx, tradefed.BaseTestProviderKey, tradefed.BaseTestProviderData{
- TestcaseRelDataFiles: testcaseRel(a.data),
+ InstalledFiles: a.data,
OutputFile: a.OutputFile(),
TestConfig: a.testConfig,
HostRequiredModuleNames: a.HostRequiredModuleNames(),
@@ -1452,8 +1451,6 @@
IsHost: false,
LocalCertificate: a.certificate.AndroidMkString(),
IsUnitTest: Bool(a.testProperties.Test_options.Unit_test),
- MkInclude: "$(BUILD_SYSTEM)/soong_app_prebuilt.mk",
- MkAppClass: "APPS",
})
android.SetProvider(ctx, android.TestOnlyProviderKey, android.TestModuleInformation{
TestOnly: true,
@@ -1462,14 +1459,6 @@
}
-func testcaseRel(paths android.Paths) []string {
- relPaths := []string{}
- for _, p := range paths {
- relPaths = append(relPaths, p.Rel())
- }
- return relPaths
-}
-
func (a *AndroidTest) FixTestConfig(ctx android.ModuleContext, testConfig android.Path) android.Path {
if testConfig == nil {
return nil
diff --git a/java/java.go b/java/java.go
index fff902f..53b3481 100644
--- a/java/java.go
+++ b/java/java.go
@@ -1559,16 +1559,14 @@
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),
})
}