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

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2422059 Change-Id: I146c08b6cb3fba28771ec3bf3ef7053609b70b80 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-09 09:13:33 +00:00
parent fba593653f e1cd5baf7a
commit caf7a70ba9
1 changed files with 2 additions and 0 deletions
--- a/ProtoLibraries.bp
+++ b/ProtoLibraries.bp
@@ -100,6 +100,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,