Add SupportFilesInfo provider
This provider will be used to collect the
SOONG_INSTALLED_COMPATIBILITY_SUPPORT_FILES in device-tests mk code.
Test: CI
Bug: 388850000
Change-Id: I0e9d758eb83e289a806872f91515c5e5674cd4d0
diff --git a/android/test_suites.go b/android/test_suites.go
index 9eaf785..dbcd48c 100644
--- a/android/test_suites.go
+++ b/android/test_suites.go
@@ -42,6 +42,12 @@
var TestSuiteInfoProvider = blueprint.NewProvider[TestSuiteInfo]()
+type SupportFilesInfo struct {
+ SupportFiles InstallPaths
+}
+
+var SupportFilesInfoProvider = blueprint.NewProvider[SupportFilesInfo]()
+
func (t *testSuiteFiles) GenerateBuildActions(ctx SingletonContext) {
files := make(map[string]map[string]InstallPaths)
diff --git a/tradefed_modules/test_module_config.go b/tradefed_modules/test_module_config.go
index 2b34128..e833df2 100644
--- a/tradefed_modules/test_module_config.go
+++ b/tradefed_modules/test_module_config.go
@@ -1,14 +1,15 @@
package tradefed_modules
import (
- "android/soong/android"
- "android/soong/tradefed"
"encoding/json"
"fmt"
"io"
"slices"
"strings"
+ "android/soong/android"
+ "android/soong/tradefed"
+
"github.com/google/blueprint"
"github.com/google/blueprint/proptools"
)
@@ -178,6 +179,10 @@
moduleInfoJSON.TestConfig = []string{m.testConfig.String()}
moduleInfoJSON.AutoTestConfig = []string{"true"}
moduleInfoJSON.TestModuleConfigBase = proptools.String(m.Base)
+
+ android.SetProvider(ctx, android.SupportFilesInfoProvider, android.SupportFilesInfo{
+ SupportFiles: m.supportFiles,
+ })
}
// Ensure at least one test_suite is listed. Ideally it should be general-tests
@@ -327,6 +332,9 @@
func (m *testModuleConfigHostModule) GenerateAndroidBuildActions(ctx android.ModuleContext) {
m.validateBase(ctx, &testModuleConfigHostTag, "java_test_host", true)
m.generateManifestAndConfig(ctx)
+ android.SetProvider(ctx, android.SupportFilesInfoProvider, android.SupportFilesInfo{
+ SupportFiles: m.supportFiles,
+ })
}
// Ensure the base listed is the right type by checking that we get the expected provider data.