diff options
| author | 2024-11-07 22:37:01 +0000 | |
|---|---|---|
| committer | 2024-11-07 22:37:01 +0000 | |
| commit | 876b8038f99383c25401e79c9fead47305b13eec (patch) | |
| tree | 4aec10e56d0c3d01160c0d6dd3100f7b94e066fe /java/java.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/java.go')
| -rw-r--r-- | java/java.go | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/java/java.go b/java/java.go index fff902fa1..53b3481d0 100644 --- a/java/java.go +++ b/java/java.go @@ -1559,16 +1559,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), }) } |