diff options
| author | 2025-02-20 11:03:12 -0800 | |
|---|---|---|
| committer | 2025-02-20 11:03:12 -0800 | |
| commit | ebc3d69b42a6bf6efb7571afb9d0991531db13cf (patch) | |
| tree | 448443c08f022069c9de6d889901fc3b07db3185 /java | |
| parent | be19d8a6fbc41d6ac154f8b146b17ae852a78227 (diff) | |
| parent | 367827f1d32a0e6ab2ce749cfe0c412474e7b030 (diff) | |
Merge "Convert stubLibraries, soongMetricsSingleton, sdkSingleton, complianceMetadataSingleton, freezeApiSingleton and testSuiteFiles to use ModuleProxy." into main
Diffstat (limited to 'java')
| -rw-r--r-- | java/ravenwood.go | 8 | ||||
| -rw-r--r-- | java/robolectric.go | 8 | ||||
| -rw-r--r-- | java/sdk.go | 2 |
3 files changed, 17 insertions, 1 deletions
diff --git a/java/ravenwood.go b/java/ravenwood.go index 3b6c80bc6..c4078c587 100644 --- a/java/ravenwood.go +++ b/java/ravenwood.go @@ -267,6 +267,10 @@ func (r *ravenwoodTest) GenerateAndroidBuildActions(ctx android.ModuleContext) { moduleInfoJSON.TestConfig = append(moduleInfoJSON.TestConfig, r.testConfig.String()) } moduleInfoJSON.CompatibilitySuites = []string{"general-tests", "ravenwood-tests"} + + android.SetProvider(ctx, android.TestSuiteInfoProvider, android.TestSuiteInfo{ + TestSuites: r.TestSuites(), + }) } func (r *ravenwoodTest) AndroidMkEntries() []android.AndroidMkEntries { @@ -384,6 +388,10 @@ func (r *ravenwoodLibgroup) GenerateAndroidBuildActions(ctx android.ModuleContex // Normal build should perform install steps ctx.Phony(r.BaseModuleName(), android.PathForPhony(ctx, r.BaseModuleName()+"-install")) + + android.SetProvider(ctx, android.TestSuiteInfoProvider, android.TestSuiteInfo{ + TestSuites: r.TestSuites(), + }) } // collectTransitiveJniDeps returns all JNI dependencies, including transitive diff --git a/java/robolectric.go b/java/robolectric.go index 43e17f9ea..5dcc7dd81 100644 --- a/java/robolectric.go +++ b/java/robolectric.go @@ -279,6 +279,10 @@ func (r *robolectricTest) GenerateAndroidBuildActions(ctx android.ModuleContext) } else { moduleInfoJSON.CompatibilitySuites = append(moduleInfoJSON.CompatibilitySuites, "null-suite") } + + android.SetProvider(ctx, android.TestSuiteInfoProvider, android.TestSuiteInfo{ + TestSuites: r.TestSuites(), + }) } func generateSameDirRoboTestConfigJar(ctx android.ModuleContext, outputFile android.ModuleOutPath) { @@ -416,6 +420,10 @@ func (r *robolectricRuntimes) GenerateAndroidBuildActions(ctx android.ModuleCont android.SetProvider(ctx, RobolectricRuntimesInfoProvider, RobolectricRuntimesInfo{ Runtimes: r.runtimes, }) + + android.SetProvider(ctx, android.TestSuiteInfoProvider, android.TestSuiteInfo{ + TestSuites: r.TestSuites(), + }) } func (r *robolectricRuntimes) InstallInTestcases() bool { return true } diff --git a/java/sdk.go b/java/sdk.go index 27b2434c5..8510959df 100644 --- a/java/sdk.go +++ b/java/sdk.go @@ -358,7 +358,7 @@ func createAPIFingerprint(ctx android.SingletonContext) { "api_fingerprint", } count := 0 - ctx.VisitAllModules(func(module android.Module) { + ctx.VisitAllModuleProxies(func(module android.ModuleProxy) { name := ctx.ModuleName(module) if android.InList(name, apiTxtFileModules) { cmd.Inputs(android.OutputFilesForModule(ctx, module, "")) |