| commit | ec03ba5c8d08fa97b05c3214e82bdb30377b654f | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Wed Jan 26 22:38:53 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jan 26 22:38:53 2022 +0000 |
| tree | d92b2f0e4bccb95774b935c0f82a442b3c026cda | |
| parent | c55fca1407553e24b71773b0f78e1290934661b3 [diff] | |
| parent | 04913f819d64ac2251a6f0b5525518ba5dff4838 [diff] |
Merge "Set JDK 11 for robolectric test configuration" am: ee5ceff61e am: 419277c2d2 am: 04913f819d Original change: https://android-review.googlesource.com/c/platform/build/+/1961320 Change-Id: I3f531f65572e2f0cccc37fdf08e524e0926b4cde
diff --git a/core/robolectric_test_config_template.xml b/core/robolectric_test_config_template.xml index e62175f..483b957 100644 --- a/core/robolectric_test_config_template.xml +++ b/core/robolectric_test_config_template.xml
@@ -18,7 +18,7 @@ <option name="test-suite-tag" value="robolectric" /> <option name="test-suite-tag" value="robolectric-tests" /> - <option name="java-folder" value="prebuilts/jdk/jdk9/linux-x86/" /> + <option name="java-folder" value="prebuilts/jdk/jdk11/linux-x86/" /> <option name="exclude-paths" value="java" /> <option name="use-robolectric-resources" value="true" />