Merge "Pin tradefed dependencies to Java 11" am: e1cd5baf7a am: caf7a70ba9 am: db2bb03458

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2422059 Change-Id: I9392754c6f8a4e8c308ab9e68ca40c2ae8db5e23 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-09 10:42:03 +00:00
parent e2cc5dad92 db2bb03458
commit 807f4ba257
1 changed files with 2 additions and 0 deletions
--- a/ProtoLibraries.bp
+++ b/ProtoLibraries.bp
@@ -97,6 +97,8 @@ java_library_host {
        ],
        type: "full",
    },
+    // b/267831518: Pin tradefed and dependencies to Java 11.
+    java_version: "11",
    // Protos have lots of MissingOverride and similar.
    errorprone: {
        enabled: false,