commit e1f8e3ccaf185007aa5cd6de01e1d3d7b0244343
author Sorin Basca <sorinbasca@google.com> Wed Dec 21 15:58:58 2022 +0000
committer Treehugger Robot <treehugger-gerrit@google.com> Thu Dec 22 10:22:04 2022 +0000
tree f73ebc52b5047edaa4369e353a1b37a2a10d649b
parent 80cd10dc868a0f8b6705fa1c20086b6aabd3f0fe

Use JDK 17 for art test build

Bug: 233029164
Test: art/tools/buildbot-build.sh --host
Change-Id: I28f18c201a816dca7351c2f7a953fa71f5c9aafa

test/run_test_build.py

diff --git a/test/run_test_build.py b/test/run_test_build.py
index 1e4b25e..75cd64f 100755
--- a/test/run_test_build.py
+++ b/test/run_test_build.py
@@ -167,7 +167,7 @@
     output = relpath(Path(args[args.index("--output") + 1]), self.rbe_exec_root)
     return self.rbe_wrap([
       "--output_files" if output.endswith(".jar") else "--output_directories", output,
-      "--toolchain_inputs=prebuilts/jdk/jdk11/linux-x86/bin/java",
+      "--toolchain_inputs=prebuilts/jdk/jdk17/linux-x86/bin/java",
       d8_path] + args, inputs)
 
   def rbe_smali(self, smali_path:Path, args):
@@ -175,7 +175,7 @@
     output = relpath(Path(args[args.index("--output") + 1]), self.rbe_exec_root)
     return self.rbe_wrap([
       "--output_files", output,
-      "--toolchain_inputs=prebuilts/jdk/jdk11/linux-x86/bin/java",
+      "--toolchain_inputs=prebuilts/jdk/jdk17/linux-x86/bin/java",
       smali_path] + args, inputs)
 
   def build(self) -> None: