commit f86b2973c1f2994a879544c60304f2a34b34e92c
author Treehugger Robot <treehugger-gerrit@google.com> Thu Jun 14 20:55:07 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jun 14 20:55:07 2018 +0000
tree e5501d94586b1c62101c08a9a7345617e3850ab7
parent 3146aa7630073c1a303e0cb131a8bf2ae70340c0
parent 081a3a9a6c356a5fda2bba7cecc4964a6d66b0dc

Merge "Protobuf: Suppress MissingOverride"

Android.bp

diff --git a/Android.bp b/Android.bp
index b86f764..1c3a609 100644
--- a/Android.bp
+++ b/Android.bp
@@ -453,10 +453,18 @@
 
 }
 
+java_defaults {
+    name: "libprotobuf_errorprone_defaults",
+    errorprone: {
+        javacflags: ["-Xep:MissingOverride:OFF"],  // b/73499927
+    },
+}
+
 // Java nano library
 // =======================================================
 java_library_static {
     name: "libprotobuf-java-nano",
+    defaults: ["libprotobuf_errorprone_defaults"],
     host_supported: true,
 
     sdk_version: "9",
@@ -487,6 +495,7 @@
 // =======================================================
 java_library_static {
     name: "libprotobuf-java-micro",
+    defaults: ["libprotobuf_errorprone_defaults"],
     host_supported: true,
 
     sdk_version: "8",
@@ -570,6 +579,7 @@
 // =======================================================
 java_library_host {
     name: "libprotobuf-java-full",
+    defaults: ["libprotobuf_errorprone_defaults"],
 
     srcs: [
         "java/core/src/main/java/**/*.java",