| commit | 419277c2d23b4caace969e4b3694007a68b0cfec | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Wed Jan 26 22:02:31 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jan 26 22:02:31 2022 +0000 |
| tree | ad378bdea98793533ea7ae4dc5868ed084eb337a | |
| parent | cf5f83a368d2f795a5c3e82d4f43005c1a7f2fc5 [diff] | |
| parent | ee5ceff61e4a7fdcbfdb1c9739b31e8d5a07155c [diff] |
Merge "Set JDK 11 for robolectric test configuration" am: ee5ceff61e Original change: https://android-review.googlesource.com/c/platform/build/+/1961320 Change-Id: I762047562d8420cda8966a6bc8daab43f1f06c62
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" />