Snap for 10453563 from b2c653efad15baf736c94ef04454e05088f2cbb7 to mainline-conscrypt-releaseaml_con_341614000aml_con_341511080aml_con_341410300aml_con_341310090aml_con_341110000android14-mainline-conscrypt-release

Change-Id: I5979669d8ec48b03737a6c0580e1d6e5a7a750ba

1 files changed, 7 insertions, 0 deletions

diff --git a/Android.bp b/Android.bp
index d1a7625..dc2d598 100644
--- a/Android.bp
+++ b/Android.bp
@@ -41,6 +41,8 @@ java_library {
     srcs: ["src/main/java/**/*.java"],
     sdk_version: "core_current",
     static_libs: ["junit"],
+    // b/267831518: Pin tradefed and dependencies to Java 11.
+    java_version: "11",
 }
 
 // compatibility host library with old name
@@ -72,6 +74,11 @@ java_test {
         "junit-params",
         "junit-params-assertj-core",
     ],
+    errorprone: {
+        javacflags: [
+            "-Xep:JUnitParameterMethodNotFound:WARN",
+        ],
+    },
 }
 
 //-------------------------------