android_test handles test_options.tradefed_options
Unlike java_host_test, android_test silently ignored the properties.
This change fixes that.
In addition, adding a test case for test_config_template.
Bug: N/A
Test: run-soong-tests-with-go-tools.sh
Change-Id: I673360e12713b8e30739bce471371ff9347c6f55
diff --git a/java/app.go b/java/app.go
index b0dcbb0..d56ea5f 100644
--- a/java/app.go
+++ b/java/app.go
@@ -1565,6 +1565,9 @@
}
a.generateAndroidBuildActions(ctx)
+ for _, c := range a.testProperties.Test_options.Tradefed_options {
+ configs = append(configs, c)
+ }
for _, module := range a.testProperties.Test_mainline_modules {
configs = append(configs, tradefed.Option{Name: "config-descriptor:metadata", Key: "mainline-param", Value: module})
}