commit 572cf5dfcf50b66565dfc987f81152d7e9c98e6d
author Alice Wang <aliceywang@google.com> Tue Mar 19 16:34:13 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Mar 19 16:34:13 2024 +0000
tree 8c736dde0f6155d7625056b1a639dd12ea72e60d
parent 3980f2c12d09abd30c26f2c9619afe8e62ac0882
parent 55f27b7b5079e32b0b5accdda4a02e941b48284b

Merge "Make bouncycastle-unbundle visible to avf tests" into main

Android.bp

diff --git a/Android.bp b/Android.bp
index 6da80ac..f56f10e 100644
--- a/Android.bp
+++ b/Android.bp
@@ -51,6 +51,9 @@
     errorprone: {
         javacflags: [
             "-Xep:MissingOverride:OFF", // Ignore missing @Override.
+            "-Xep:BoxedPrimitiveEquality:WARN",
+            "-Xep:DoubleBraceInitialization:WARN",
+            "-Xep:HashtableContains:WARN",
         ],
     },
 }
@@ -65,13 +68,6 @@
     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
@@ -342,6 +338,7 @@
 //Excludes directories not needed.
 java_library {
     name: "bouncycastle-uwb",
+    defaults: ["bouncycastle-errorprone-defaults"],
     visibility: [
         "//packages/modules/Uwb/service",
     ],