aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-07-07 04:52:56 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-07-07 04:52:56 +0000
commit5171e595af98c7389b0ef2334a8ee1e4a5652590 (patch)
tree90d830075f87b066ca8274af026282b32459144d
parent96e1a55517f7c6be5611f580e43529a2c9122b73 (diff)
parentfe03c97878f5a4a8633ba0f918fedb58c315fa5a (diff)
downloadxz-java-aml_con_341614000.tar.gz
Snap for 10453563 from fe03c97878f5a4a8633ba0f918fedb58c315fa5a to mainline-conscrypt-releaseaml_con_341614000aml_con_341511080aml_con_341410300aml_con_341310090aml_con_341110000android14-mainline-conscrypt-release
Change-Id: Ifa0a69fb72be96c695dfeab4fb48cea9f596b6bb
-rw-r--r--Android.bp5
1 files changed, 5 insertions, 0 deletions
diff --git a/Android.bp b/Android.bp
index 20760f8..f4d0a1d 100644
--- a/Android.bp
+++ b/Android.bp
@@ -38,4 +38,9 @@ java_library_static {
host_supported: true,
sdk_version: "current",
+ // TODO(b/237039251) use "apex_inherit" when Java modules support it
+ min_sdk_version: "29",
+ // b/267831518: Pin tradefed and dependencies to Java 11.
+ java_version: "11",
+
}