diff options
| author | yike <yikezh@google.com> | 2024-05-09 00:44:05 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2024-05-09 00:44:05 +0000 |
| commit | f2d40132624eb44ebbb3845724ca228afed7f21d (patch) | |
| tree | f7fe20ad674f8e51c9871255bacd25897a5a49ad | |
| parent | 91373a2bfb7f9e330ebf9ff2d9b4acd2ec7032b8 (diff) | |
| parent | 68d4da10026c61b4910fc71e4736e81022c76566 (diff) | |
| download | googleapis-master.tar.gz | |
Original change: https://android-review.googlesource.com/c/platform/external/googleapis/+/3079463
Change-Id: I9ec245f66cb95c6dbec82e2992f720fa56c4de9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | google/api/Android.bp | 8 | ||||
| -rw-r--r-- | google/bytestream/Android.bp | 4 | ||||
| -rw-r--r-- | google/longrunning/Android.bp | 2 | ||||
| -rw-r--r-- | google/rpc/Android.bp | 2 |
4 files changed, 16 insertions, 0 deletions
diff --git a/google/api/Android.bp b/google/api/Android.bp index f385fc277..9c396ecd5 100644 --- a/google/api/Android.bp +++ b/google/api/Android.bp @@ -34,6 +34,8 @@ java_library_host { ], type: "full", }, + // TODO(b/339514031): Unpin tradefed dependencies to Java 11. + java_version: "11", } java_library_host { @@ -47,6 +49,8 @@ java_library_host { ], type: "full", }, + // TODO(b/339514031): Unpin tradefed dependencies to Java 11. + java_version: "11", } java_library_host { @@ -67,6 +71,8 @@ java_library_host { ], type: "full", }, + // TODO(b/339514031): Unpin tradefed dependencies to Java 11. + java_version: "11", } java_library_host { @@ -80,4 +86,6 @@ java_library_host { ], 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 1bb6d2cf6..83a374da9 100644 --- a/google/bytestream/Android.bp +++ b/google/bytestream/Android.bp @@ -25,6 +25,8 @@ java_library_host { 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 @@ java_library_host { "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 4e4cfef76..8a7c1a7a8 100644 --- a/google/longrunning/Android.bp +++ b/google/longrunning/Android.bp @@ -36,4 +36,6 @@ java_library_host { ], 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 532ed8995..f6809c88d 100644 --- a/google/rpc/Android.bp +++ b/google/rpc/Android.bp @@ -31,4 +31,6 @@ java_library_host { ], type: "full", }, + // TODO(b/339514031): Unpin tradefed dependencies to Java 11. + java_version: "11", } |