From 2fd661b2836137cc420d2f768a301032ca33d659 Mon Sep 17 00:00:00 2001
From: Cole Faust <colefaust@google.com>
Date: Sat, 19 Jun 2021 00:54:23 +0000
Subject: [PATCH] Use enabled: false to disable errorprone

Enabled: false is more performant than -XepDisableAllChecks,
as normally the module is built twice, once with and once
without errorprone. Enabled: false will entirely remove
the second build.

Bug: 190944875
Bug: 72714520
Change-Id: Ie393f41a33e59dc4fd36b98ca2fd87f53c0f9785
Test: Presumbits
---
 ProtoLibraries.bp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/ProtoLibraries.bp b/ProtoLibraries.bp
index 7e3cc2739cd0a..db5ba2fd031f0 100644
--- a/ProtoLibraries.bp
+++ b/ProtoLibraries.bp
@@ -98,7 +98,7 @@ java_library_host {
     },
     // Protos have lots of MissingOverride and similar.
     errorprone: {
-        javacflags: ["-XepDisableAllChecks"],
+        enabled: false,
     },
 }
 
@@ -124,6 +124,10 @@ java_library {
         "libs/incident/proto/android/os/**/*.proto",
         ":service-permission-protos",
     ],
+    // Protos have lots of MissingOverride and similar.
+    errorprone: {
+        enabled: false,
+    },
 }
 
 // ====  java proto device library (for test only)  ==============================
@@ -150,7 +154,7 @@ java_library {
     sdk_version: "core_current",
     // Protos have lots of MissingOverride and similar.
     errorprone: {
-        javacflags: ["-XepDisableAllChecks"],
+        enabled: false,
     },
 }