Pin the Java version to 11 am: 68d4da1002 am: f2d4013262 Original change: https://android-review.googlesource.com/c/platform/external/googleapis/+/3079463 Change-Id: I1295a78a78f973c0c63a1ca62fb316fec966dbfb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/google/api/Android.bp b/google/api/Android.bp index f385fc2..9c396ec 100644 --- a/google/api/Android.bp +++ b/google/api/Android.bp
@@ -34,6 +34,8 @@ ], type: "full", }, + // TODO(b/339514031): Unpin tradefed dependencies to Java 11. + java_version: "11", } java_library_host { @@ -47,6 +49,8 @@ ], type: "full", }, + // TODO(b/339514031): Unpin tradefed dependencies to Java 11. + java_version: "11", } java_library_host { @@ -67,6 +71,8 @@ ], type: "full", }, + // TODO(b/339514031): Unpin tradefed dependencies to Java 11. + java_version: "11", } java_library_host { @@ -80,4 +86,6 @@ ], type: "full", }, + // TODO(b/339514031): Unpin tradefed dependencies to Java 11. + java_version: "11", }
diff --git a/google/bytestream/Android.bp b/google/bytestream/Android.bp index 1bb6d2c..83a374d 100644 --- a/google/bytestream/Android.bp +++ b/google/bytestream/Android.bp
@@ -25,6 +25,8 @@ include_dirs: ["external/protobuf/src"], type: "full", }, + // TODO(b/339514031): Unpin tradefed dependencies to Java 11. + java_version: "11", } java_library_host { @@ -42,4 +44,6 @@ "guava", "javax-annotation-api-prebuilt-host-jar", ], + // TODO(b/339514031): Unpin tradefed dependencies to Java 11. + java_version: "11", }
diff --git a/google/longrunning/Android.bp b/google/longrunning/Android.bp index 4e4cfef..8a7c1a7 100644 --- a/google/longrunning/Android.bp +++ b/google/longrunning/Android.bp
@@ -36,4 +36,6 @@ ], type: "full", }, + // TODO(b/339514031): Unpin tradefed dependencies to Java 11. + java_version: "11", }
diff --git a/google/rpc/Android.bp b/google/rpc/Android.bp index 532ed89..f6809c8 100644 --- a/google/rpc/Android.bp +++ b/google/rpc/Android.bp
@@ -31,4 +31,6 @@ ], type: "full", }, + // TODO(b/339514031): Unpin tradefed dependencies to Java 11. + java_version: "11", }