Add test_mainline_modules to the auto-gen test config(AndroidJUnitTest only).
To support parameterized mainline modules in Test Mapping, we plan to add a new parameter called test_mainline_modules in build system to auto-generate the test config based on the parameter. For detailed information: go/test-mapping-mainline-gcl (search for auto-generated pattern) Bug: 155238134 Test: add "test_mainline_modules: [some.apk]" to TetheringTests, and build the modules, confirm the parameterized option is added in the test config. Change-Id: I41ba8749ce46da62db402a8b8a555d4874e1cfc0
This commit is contained in:
@@ -219,31 +219,39 @@ func AutoGenRustTestConfig(ctx android.ModuleContext, name string, testConfigPro
|
||||
}
|
||||
|
||||
var autogenInstrumentationTest = pctx.StaticRule("autogenInstrumentationTest", blueprint.RuleParams{
|
||||
Command: "${AutoGenTestConfigScript} $out $in ${EmptyTestConfig} $template",
|
||||
Command: "${AutoGenTestConfigScript} $out $in ${EmptyTestConfig} $template ${extraConfigs}",
|
||||
CommandDeps: []string{
|
||||
"${AutoGenTestConfigScript}",
|
||||
"${EmptyTestConfig}",
|
||||
"$template",
|
||||
},
|
||||
}, "name", "template")
|
||||
}, "name", "template", "extraConfigs")
|
||||
|
||||
func AutoGenInstrumentationTestConfig(ctx android.ModuleContext, testConfigProp *string,
|
||||
testConfigTemplateProp *string, manifest android.Path, testSuites []string, autoGenConfig *bool) android.Path {
|
||||
testConfigTemplateProp *string, manifest android.Path, testSuites []string, autoGenConfig *bool, configs []Config) android.Path {
|
||||
path, autogenPath := testConfigPath(ctx, testConfigProp, testSuites, autoGenConfig, testConfigTemplateProp)
|
||||
var configStrings []string
|
||||
if autogenPath != nil {
|
||||
template := "${InstrumentationTestConfigTemplate}"
|
||||
moduleTemplate := getTestConfigTemplate(ctx, testConfigTemplateProp)
|
||||
if moduleTemplate.Valid() {
|
||||
template = moduleTemplate.String()
|
||||
}
|
||||
for _, config := range configs {
|
||||
configStrings = append(configStrings, config.Config())
|
||||
}
|
||||
extraConfigs := strings.Join(configStrings, fmt.Sprintf("\\n%s", test_xml_indent))
|
||||
extraConfigs = fmt.Sprintf("--extra-configs '%s'", extraConfigs)
|
||||
|
||||
ctx.Build(pctx, android.BuildParams{
|
||||
Rule: autogenInstrumentationTest,
|
||||
Description: "test config",
|
||||
Input: manifest,
|
||||
Output: autogenPath,
|
||||
Args: map[string]string{
|
||||
"name": ctx.ModuleName(),
|
||||
"template": template,
|
||||
"name": ctx.ModuleName(),
|
||||
"template": template,
|
||||
"extraConfigs": extraConfigs,
|
||||
},
|
||||
})
|
||||
return autogenPath
|
||||
|
Reference in New Issue
Block a user