Merge "Add extra_test_configs option"

This commit is contained in:
Treehugger Robot
2020-08-21 16:22:43 +00:00
committed by Gerrit Code Review
5 changed files with 45 additions and 7 deletions

View File

@@ -1034,8 +1034,9 @@ type AndroidTest struct {
testProperties testProperties
testConfig android.Path
data android.Paths
testConfig android.Path
extraTestConfigs android.Paths
data android.Paths
}
func (a *AndroidTest) InstallInTestcases() bool {
@@ -1063,6 +1064,7 @@ func (a *AndroidTest) GenerateAndroidBuildActions(ctx android.ModuleContext) {
testConfig := tradefed.AutoGenInstrumentationTestConfig(ctx, a.testProperties.Test_config,
a.testProperties.Test_config_template, a.manifestPath, a.testProperties.Test_suites, a.testProperties.Auto_gen_config, configs)
a.testConfig = a.FixTestConfig(ctx, testConfig)
a.extraTestConfigs = android.PathsForModuleSrc(ctx, a.testProperties.Test_options.Extra_test_configs)
a.data = android.PathsForModuleSrc(ctx, a.testProperties.Data)
}