diff --git a/Android.bp b/Android.bp
index 6648cf6..e1d33c7 100644
--- a/Android.bp
+++ b/Android.bp
@@ -60,6 +60,13 @@
     ],
 
     sdk_version: "core_current",
+
+    errorprone: {
+        javacflags: [
+            "-Xep:EmptyTopLevelDeclaration:WARN",
+            "-Xep:ReturnValueIgnored:WARN",
+        ],
+    },
 }
 
 // Build Dexmaker's MockMaker, a plugin to Mockito
@@ -179,6 +186,12 @@
         "libdexmakerjvmtiagent",
         "libstaticjvmtiagent",
     ],
+
+    errorprone: {
+        javacflags: [
+            "-Xep:ReturnValueIgnored:WARN",
+        ],
+    },
 }
 
 // Provides mockito functionality for on-device tests. Does not allow stubbing of final or static
@@ -279,6 +292,12 @@
         "dexmaker",
         "junit",
     ],
+
+    errorprone: {
+        javacflags: [
+            "-Xep:ReturnValueIgnored:WARN",
+        ],
+    },
 }
 
 // dexmaker-mockito tests
@@ -294,6 +313,12 @@
         "junit",
         "dexmaker-mockmaker",
     ],
+
+    errorprone: {
+        javacflags: [
+            "-Xep:ReturnValueIgnored:WARN",
+        ],
+    },
 }
 
 // dexmaker-mockito-inline tests