pass test runtime properties through build.
Strict mode is now availbale as a runtime system property.
Bug: None
Test: atest MyRobo*Tests
Change-Id: Ic6317ea56723a76e9dfd15e70fdfc8f8ad713608
diff --git a/java/robolectric.go b/java/robolectric.go
index 29aa2f0..6c74d08 100644
--- a/java/robolectric.go
+++ b/java/robolectric.go
@@ -138,10 +138,17 @@
r.forceOSType = ctx.Config().BuildOS
r.forceArchType = ctx.Config().BuildArch
+ var options []tradefed.Option
+ options = append(options, tradefed.Option{Name: "java-flags", Value: "-Drobolectric=true"})
+ if proptools.BoolDefault(r.robolectricProperties.Strict_mode, true) {
+ options = append(options, tradefed.Option{Name: "java-flags", Value: "-Drobolectric.strict.mode=true"})
+ }
+
r.testConfig = tradefed.AutoGenTestConfig(ctx, tradefed.AutoGenTestConfigOptions{
TestConfigProp: r.testProperties.Test_config,
TestConfigTemplateProp: r.testProperties.Test_config_template,
TestSuites: r.testProperties.Test_suites,
+ TestRunnerOptions: options,
AutoGenConfig: r.testProperties.Auto_gen_config,
DeviceTemplate: "${RobolectricTestConfigTemplate}",
HostTemplate: "${RobolectricTestConfigTemplate}",