commit | 90721770ca416329c59c20ebb9c1edcee9666f0f | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Wed Jan 26 23:02:59 2022 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jan 26 23:02:59 2022 +0000 |
tree | da02a8a845fc72441dbe344a6e4793595fb8d8e5 | |
parent | 0aa995216caf6f86dfaf684782912859bf2a19b8 [diff] | |
parent | ec03ba5c8d08fa97b05c3214e82bdb30377b654f [diff] |
Merge "Set JDK 11 for robolectric test configuration" am: ee5ceff61e am: 419277c2d2 am: 04913f819d am: ec03ba5c8d Original change: https://android-review.googlesource.com/c/platform/build/+/1961320 Change-Id: Idcb928c490c5cf90e673dcaf3d60d6ab13527175
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" />