Merge "Use JDK 21 instead of 17" into main

This commit is contained in:
Treehugger Robot
2024-07-18 16:47:48 +00:00
committed by Gerrit Code Review
2 changed files with 2 additions and 2 deletions

View File

@@ -18,7 +18,7 @@
<option name="test-suite-tag" value="ravenwood" />
<option name="test-suite-tag" value="ravenwood-tests" />
<option name="java-folder" value="prebuilts/jdk/jdk17/linux-x86/" />
<option name="java-folder" value="prebuilts/jdk/jdk21/linux-x86/" />
<option name="use-ravenwood-resources" value="true" />
<option name="exclude-paths" value="java" />
<option name="socket-timeout" value="10000" />

View File

@@ -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/jdk17/linux-x86/" />
<option name="java-folder" value="prebuilts/jdk/jdk21/linux-x86/" />
<option name="exclude-paths" value="java" />
<option name="use-robolectric-resources" value="true" />