StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use JDK 21 instead of 17" into main am: 726c69d608

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/+/3182280

Change-Id: If664ea4a23b26828db1d96c05fe39ccbd6125774
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2024-07-18 17:30:21 +00:00
committed by Automerger Merge Worker
parent 5b8786429a 726c69d608
commit 01be392dd1
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/ravenwood_test_config_template.xml
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" />

2
core/robolectric_test_config_template.xml
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" />