diff options
| author | 2025-01-28 13:19:19 -0800 | |
|---|---|---|
| committer | 2025-01-28 14:36:08 -0800 | |
| commit | 208f8e754965d18093c78a08eb7228ce87dcca1b (patch) | |
| tree | 77e9715f4896ca4d9dbf2e66f45d94ca783774c9 | |
| parent | c159fddcbb8ff8b6a5e3171118394954c7d7cbbf (diff) | |
Convert robolectric_test's module-info.json to song
This produces this diff, which I beleive is beneign:
https://paste.googleplex.com/4846726910050304
Bug: 389720048
Test: diff'd module-info.json
Change-Id: I531644d208a0a9d0fb2166d158f77e671554e5d8
| -rw-r--r-- | java/java.go | 5 | ||||
| -rw-r--r-- | java/robolectric.go | 13 |
2 files changed, 18 insertions, 0 deletions
diff --git a/java/java.go b/java/java.go index 66550d562..a5e1be7f9 100644 --- a/java/java.go +++ b/java/java.go @@ -1070,6 +1070,10 @@ func (j *Library) GenerateAndroidBuildActions(ctx android.ModuleContext) { setOutputFiles(ctx, j.Module) + j.javaLibraryModuleInfoJSON(ctx) +} + +func (j *Library) javaLibraryModuleInfoJSON(ctx android.ModuleContext) *android.ModuleInfoJSON { moduleInfoJSON := ctx.ModuleInfoJSON() moduleInfoJSON.Class = []string{"JAVA_LIBRARIES"} if j.implementationAndResourcesJar != nil { @@ -1092,6 +1096,7 @@ func (j *Library) GenerateAndroidBuildActions(ctx android.ModuleContext) { moduleInfoJSON.Disabled = true j.dexpreopter.ModuleInfoJSONForApex(ctx) } + return moduleInfoJSON } func (j *Library) getJarInstallDir(ctx android.ModuleContext) android.InstallPath { diff --git a/java/robolectric.go b/java/robolectric.go index ff0c850d5..ed3fc9a63 100644 --- a/java/robolectric.go +++ b/java/robolectric.go @@ -261,6 +261,19 @@ func (r *robolectricTest) GenerateAndroidBuildActions(ctx android.ModuleContext) setExtraJavaInfo(ctx, r, javaInfo) android.SetProvider(ctx, JavaInfoProvider, javaInfo) } + + moduleInfoJSON := r.javaLibraryModuleInfoJSON(ctx) + if _, ok := r.testConfig.(android.WritablePath); ok { + moduleInfoJSON.AutoTestConfig = []string{"true"} + } + if r.testConfig != nil { + moduleInfoJSON.TestConfig = append(moduleInfoJSON.TestConfig, r.testConfig.String()) + } + if len(r.testProperties.Test_suites) > 0 { + moduleInfoJSON.CompatibilitySuites = append(moduleInfoJSON.CompatibilitySuites, r.testProperties.Test_suites...) + } else { + moduleInfoJSON.CompatibilitySuites = append(moduleInfoJSON.CompatibilitySuites, "null-suite") + } } func generateSameDirRoboTestConfigJar(ctx android.ModuleContext, outputFile android.ModuleOutPath) { |