From d107351a3a29a52f23f0bcee33c51ac1ecd3f6d3 Mon Sep 17 00:00:00 2001
From: Sorin Basca <sorinbasca@google.com>
Date: Thu, 2 Feb 2023 20:09:51 +0000
Subject: [PATCH] Pin signapk to Java 11

Bug: 267608166
Test: TH
Change-Id: I4fe29ced62f385c0d22e5d3806fd5aa6e852b193
---
 tools/signapk/Android.bp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tools/signapk/Android.bp b/tools/signapk/Android.bp
index bee6a6f11a..c4f25f8ea4 100644
--- a/tools/signapk/Android.bp
+++ b/tools/signapk/Android.bp
@@ -31,6 +31,10 @@ java_binary_host {
         "conscrypt-unbundled",
     ],
 
+    // b/267608166: Prevent target Java 17 so the host-side tool can run in an
+    // environment where JDK 11 is available.
+    java_version: "11",
+
     jni_libs: ["libconscrypt_openjdk_jni"],
 
     // The post-build signing tools need signapk.jar (and its shared libraries,