Snap for 11579193 from 3980f2c12d09abd30c26f2c9619afe8e62ac0882 to sdk-release

Change-Id: I9bd50c14746947b8a3f1cff75aa20a0e90bc5672

1 files changed, 4 insertions, 7 deletions

diff --git a/Android.bp b/Android.bp
index 1e28e274..9cee5f9a 100644
--- a/Android.bp
+++ b/Android.bp
@@ -51,6 +51,9 @@ java_defaults {
     errorprone: {
         javacflags: [
             "-Xep:MissingOverride:OFF", // Ignore missing @Override.
+            "-Xep:BoxedPrimitiveEquality:WARN",
+            "-Xep:DoubleBraceInitialization:WARN",
+            "-Xep:HashtableContains:WARN",
         ],
     },
 }
@@ -65,13 +68,6 @@ java_defaults {
     lint: {
         warning_checks: ["SuspiciousIndentation"],
     },
-    errorprone: {
-        javacflags: [
-            "-Xep:BoxedPrimitiveEquality:WARN",
-            "-Xep:DoubleBraceInitialization:WARN",
-            "-Xep:HashtableContains:WARN",
-        ],
-    },
 }
 
 // The src files for bouncycastle, used to generate core platform / intra-core
@@ -341,6 +337,7 @@ java_library {
 //Excludes directories not needed.
 java_library {
     name: "bouncycastle-uwb",
+    defaults: ["bouncycastle-errorprone-defaults"],
     visibility: [
         "//packages/modules/Uwb/service",
     ],