Merge "Fixes a few things with the robolectric autoconfig"
diff --git a/core/robolectric_test_config_template.xml b/core/robolectric_test_config_template.xml
index 78863b7..e79abd5 100644
--- a/core/robolectric_test_config_template.xml
+++ b/core/robolectric_test_config_template.xml
@@ -18,9 +18,13 @@
<option name="test-suite-tag" value="apct" />
<option name="test-suite-tag" value="apct-junit" />
+ <option name="java-folder" value="prebuilts/jdk/jdk9/linux-x86/" />
+ <option name="exclude-paths" value="java" />
+ <option name="use-robolectric-resources" value="true" />
+
{EXTRA_CONFIGS}
- <test class="com.android.tradefed.testtype.HostTest" >
+ <test class="com.android.tradefed.testtype.IsolatedHostTest" >
<option name="jar" value="{MODULE}.jar" />
</test>
</configuration>