Merge "Revert "Use the toolchain from JDK 17"" am: 61818c4aa9
Original change: https://android-review.googlesource.com/c/platform/build/+/2238536 Change-Id: Id10021d690dafce350e3a3b90fe623710530c91e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -18,7 +18,7 @@
|
|||||||
<option name="test-suite-tag" value="robolectric" />
|
<option name="test-suite-tag" value="robolectric" />
|
||||||
<option name="test-suite-tag" value="robolectric-tests" />
|
<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/jdk11/linux-x86/" />
|
||||||
<option name="exclude-paths" value="java" />
|
<option name="exclude-paths" value="java" />
|
||||||
<option name="use-robolectric-resources" value="true" />
|
<option name="use-robolectric-resources" value="true" />
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user