diff options
| author | 2024-07-17 13:20:07 +0100 | |
|---|---|---|
| committer | 2024-07-17 16:26:30 +0000 | |
| commit | 59501af329dc5f6f73ee293422d0226d1ffb362a (patch) | |
| tree | 9e495e011a5818c955bb5ea611c30b114f0056fa | |
| parent | 53ceab0bffafe690ce4325e5da6131f65bb8a859 (diff) | |
Use JDK21 for ART tests
Bug: 335612268
Test: art/tools/buildbot-build.sh --host
Test: art/tools/run-libjdwp-tests.sh --mode=device --variant=X64
Change-Id: I35fd99e0f3acad6a6e462eccc32a5182a6d5bb54
| -rwxr-xr-x | test/run_test_build.py | 4 | ||||
| -rwxr-xr-x | tools/run-libjdwp-tests.sh | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/test/run_test_build.py b/test/run_test_build.py index 4929f05447..ca4634d5ce 100755 --- a/test/run_test_build.py +++ b/test/run_test_build.py @@ -192,7 +192,7 @@ class BuildTestContext: 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/jdk17/linux-x86/bin/java", + "--toolchain_inputs=prebuilts/jdk/jdk21/linux-x86/bin/java", d8_path] + args, inputs) def rbe_smali(self, smali_path:Path, args): @@ -224,7 +224,7 @@ class BuildTestContext: ]) res = self.rbe_wrap([ "--output_files", relpath(output, self.rbe_exec_root), - "--toolchain_inputs=prebuilts/jdk/jdk17/linux-x86/bin/java", + "--toolchain_inputs=prebuilts/jdk/jdk21/linux-x86/bin/java", "/bin/bash", wrapper] + args, inputs) wrapper.unlink() return res diff --git a/tools/run-libjdwp-tests.sh b/tools/run-libjdwp-tests.sh index bb9c300836..0748140c15 100755 --- a/tools/run-libjdwp-tests.sh +++ b/tools/run-libjdwp-tests.sh @@ -118,7 +118,7 @@ if [[ "$has_jdwp_path" = "no" ]]; then echo "Please set ANDROID_BUILD_TOP" exit 1 fi - args+=(--jdwp-path $ANDROID_BUILD_TOP/"prebuilts/jdk/jdk17/linux-x86/lib/libjdwp.so") + args+=(--jdwp-path $ANDROID_BUILD_TOP/"prebuilts/jdk/jdk21/linux-x86/lib/libjdwp.so") else args+=(--jdwp-path "libjdwp.so") fi |