Merge "Add extra_test_configs option" am: ec7a91f9fa am: 82448f2d2d

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1402168

Change-Id: If619742e8271e804231d029a87f5fa1297959488
This commit is contained in:
Treehugger Robot
2020-08-21 17:26:05 +00:00
committed by Automerger Merge Worker
5 changed files with 45 additions and 7 deletions

View File

@@ -1064,8 +1064,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 {
@@ -1093,6 +1094,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)
}