aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYike Zhang <yikezh@google.com>2024-05-08 23:51:22 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2024-05-08 23:51:22 +0000
commit8579c28d271c93ec4add5e5080f9929645eda4fa (patch)
tree744909fed55d029f173c3e06928e84c2bca41cbd
parent0f60a196f4ef1ff7a116ef704260c79ca4b3b804 (diff)
parent529e5ac223f46e88574f10392cdc9c5516cd8799 (diff)
downloadbazelbuild-remote-apis-main.tar.gz
Merge "Pin the Java version to 11" into mainHEADmastermain
-rw-r--r--build/bazel/remote/execution/v2/Android.bp4
-rw-r--r--build/bazel/semver/Android.bp2
2 files changed, 6 insertions, 0 deletions
diff --git a/build/bazel/remote/execution/v2/Android.bp b/build/bazel/remote/execution/v2/Android.bp
index 5d6f900..a9893a2 100644
--- a/build/bazel/remote/execution/v2/Android.bp
+++ b/build/bazel/remote/execution/v2/Android.bp
@@ -38,6 +38,8 @@ java_library_host {
],
type: "full",
},
+ // TODO(b/339514031): Unpin tradefed dependencies to Java 11.
+ java_version: "11",
}
java_library_host {
@@ -60,4 +62,6 @@ java_library_host {
"libprotobuf-java-full",
"remote-execution-java-proto",
],
+ // TODO(b/339514031): Unpin tradefed dependencies to Java 11.
+ java_version: "11",
}
diff --git a/build/bazel/semver/Android.bp b/build/bazel/semver/Android.bp
index 2302503..46b9246 100644
--- a/build/bazel/semver/Android.bp
+++ b/build/bazel/semver/Android.bp
@@ -31,4 +31,6 @@ java_library_host {
],
type: "full",
},
+ // TODO(b/339514031): Unpin tradefed dependencies to Java 11.
+ java_version: "11",
}