diff options
| author | 2024-11-07 22:37:01 +0000 | |
|---|---|---|
| committer | 2024-11-07 22:37:01 +0000 | |
| commit | 876b8038f99383c25401e79c9fead47305b13eec (patch) | |
| tree | 4aec10e56d0c3d01160c0d6dd3100f7b94e066fe /java/app.go | |
| parent | 45dca5c8cc538392edbde4ee1077fc86509b2e38 (diff) | |
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
Diffstat (limited to 'java/app.go')
| -rw-r--r-- | java/app.go | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/java/app.go b/java/app.go index 5f4332650..e01a2ba7b 100644 --- a/java/app.go +++ b/java/app.go @@ -1442,9 +1442,8 @@ func (a *AndroidTest) GenerateAndroidBuildActions(ctx android.ModuleContext) { 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 @@ func (a *AndroidTest) GenerateAndroidBuildActions(ctx android.ModuleContext) { 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 (a *AndroidTest) GenerateAndroidBuildActions(ctx android.ModuleContext) { } -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 |