summaryrefslogtreecommitdiff
path: root/java/java.go
diff options
context:
space:
mode:
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 2025-03-11 18:28:35 -0700
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2025-03-11 18:28:35 -0700
commitd7748c944fbba9c019064f99522e6e27b3340758 (patch)
tree241905ef79fe50520e7bf7b49ac0032b9418e438 /java/java.go
parentdf76cb349374a3b1ea7287d67861904fb3b14cba (diff)
parent9697c5303c4ee46cc43064f715b86e9bef712774 (diff)
Merge "Expand TestSuiteInfoProvider to all test modules" into main am: 9697c5303c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3537561 Change-Id: Ibab106190625cf7e6d16aab13ea150e1576ac38d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'java/java.go')
-rw-r--r--java/java.go8
1 files changed, 8 insertions, 0 deletions
diff --git a/java/java.go b/java/java.go
index df81a3d4d..7f897a04f 100644
--- a/java/java.go
+++ b/java/java.go
@@ -1956,6 +1956,10 @@ func (j *Test) generateAndroidBuildActionsWithConfig(ctx android.ModuleContext,
ctx.InstallFile(pathInTestCases, ctx.ModuleName()+".jar", j.outputFile)
}
}
+
+ android.SetProvider(ctx, android.TestSuiteInfoProvider, android.TestSuiteInfo{
+ TestSuites: j.testProperties.Test_suites,
+ })
}
func (j *TestHelperLibrary) GenerateAndroidBuildActions(ctx android.ModuleContext) {
@@ -1972,6 +1976,10 @@ func (j *TestHelperLibrary) GenerateAndroidBuildActions(ctx android.ModuleContex
if optionalConfig.Valid() {
moduleInfoJSON.TestConfig = append(moduleInfoJSON.TestConfig, optionalConfig.String())
}
+
+ android.SetProvider(ctx, android.TestSuiteInfoProvider, android.TestSuiteInfo{
+ TestSuites: j.testHelperLibraryProperties.Test_suites,
+ })
}
func (j *JavaTestImport) GenerateAndroidBuildActions(ctx android.ModuleContext) {