commit 724bb64c2eb5a0f36381f61a377c04bc88ec6c7c
author Sorin Basca <sorinbasca@google.com> Sat Feb 04 15:29:36 2023 +0000
committer Sorin Basca <sorinbasca@google.com> Sat Feb 04 21:55:33 2023 +0000
tree f9fe80a0e708d51f6cb47433550c155b65f75b00
parent ed55cfca66873069500b4f7b83a6f9db82b6fb76

Pin tradefed dependencies to Java 11

Bug: 267831518
Test: TH
Change-Id: I8aafca14de518c7d32813fd8445e7390f063329f

annotation-stubs/Android.bp

diff --git a/annotation-stubs/Android.bp b/annotation-stubs/Android.bp
index 2f1c39c..f22fb10 100644
--- a/annotation-stubs/Android.bp
+++ b/annotation-stubs/Android.bp
@@ -29,6 +29,8 @@
         ":grpc-java-annotation-stubs-srcjar",
     ],
     sdk_version: "current",
+    // b/267831518: Pin tradefed and dependencies to Java 11.
+    java_version: "11",
 }
 
 gensrcs {

auth/Android.bp

diff --git a/auth/Android.bp b/auth/Android.bp
index 6d0b6b2..50437c5 100644
--- a/auth/Android.bp
+++ b/auth/Android.bp
@@ -33,4 +33,6 @@
         "guava",
         "jsr305",
     ],
+    // b/267831518: Pin tradefed and dependencies to Java 11.
+    java_version: "11",
 }

context/Android.bp

diff --git a/context/Android.bp b/context/Android.bp
index 9840870..049f59d 100644
--- a/context/Android.bp
+++ b/context/Android.bp
@@ -34,6 +34,8 @@
         "guava",
         "jsr305",
     ],
+    // b/267831518: Pin tradefed and dependencies to Java 11.
+    java_version: "11",
     sdk_version: "current",
     min_sdk_version: "33",
     apex_available: ["com.android.adservices"],

core/Android.bp

diff --git a/core/Android.bp b/core/Android.bp
index a03c5d7..bb2284f 100644
--- a/core/Android.bp
+++ b/core/Android.bp
@@ -36,6 +36,8 @@
         "jsr305",
         "guava",
     ],
+    // b/267831518: Pin tradefed and dependencies to Java 11.
+    java_version: "11",
     sdk_version: "current",
     min_sdk_version: "33",
     apex_available: ["com.android.adservices"],
@@ -54,6 +56,8 @@
         "jsr305",
         "guava",
     ],
+    // b/267831518: Pin tradefed and dependencies to Java 11.
+    java_version: "11",
     sdk_version: "current",
 }
 
@@ -85,6 +89,8 @@
             ],
         },
     },
+    // b/267831518: Pin tradefed and dependencies to Java 11.
+    java_version: "11",
     sdk_version: "current",
     min_sdk_version: "33",
     apex_available: ["com.android.adservices"],
@@ -108,5 +114,7 @@
         "jsr305",
         "guava",
     ],
+    // b/267831518: Pin tradefed and dependencies to Java 11.
+    java_version: "11",
     sdk_version: "current",
 }

protobuf-lite/Android.bp

diff --git a/protobuf-lite/Android.bp b/protobuf-lite/Android.bp
index 983b094..06f454c 100644
--- a/protobuf-lite/Android.bp
+++ b/protobuf-lite/Android.bp
@@ -35,6 +35,8 @@
         "jsr305",
         "libprotobuf-java-lite",
     ],
+    // b/267831518: Pin tradefed and dependencies to Java 11.
+    java_version: "11",
     sdk_version: "current",
     min_sdk_version: "33",
     apex_available: ["com.android.adservices"],

protobuf/Android.bp

diff --git a/protobuf/Android.bp b/protobuf/Android.bp
index f51c272..4f10a5e 100644
--- a/protobuf/Android.bp
+++ b/protobuf/Android.bp
@@ -38,4 +38,6 @@
         "libprotobuf-java-full",
         "libprotobuf-java-util-full",
     ],
+    // b/267831518: Pin tradefed and dependencies to Java 11.
+    java_version: "11",
 }

stub/Android.bp

diff --git a/stub/Android.bp b/stub/Android.bp
index dbd3a7b..e2e5986 100644
--- a/stub/Android.bp
+++ b/stub/Android.bp
@@ -35,6 +35,8 @@
         "guava",
         "jsr305",
     ],
+    // b/267831518: Pin tradefed and dependencies to Java 11.
+    java_version: "11",
     sdk_version: "current",
     min_sdk_version: "33",
     apex_available: ["com.android.adservices"],

testing/Android.bp

diff --git a/testing/Android.bp b/testing/Android.bp
index 2d2a1c6..11595de 100644
--- a/testing/Android.bp
+++ b/testing/Android.bp
@@ -45,4 +45,6 @@
         "junit",
     ],
     sdk_version: "current",
+    // b/267831518: Pin tradefed and dependencies to Java 11.
+    java_version: "11",
 }