From f89e732dc64b418b0677e159a3175fdec879d2c8 Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Fri, 25 Jun 2021 13:33:19 -0700
Subject: [PATCH] Use errorprone.extra_check_modules for error prone checks

Using plugins for error prone checks causes them to be moved from
javac to kotlin, breaking the errorprone javac run which can no longer
find the checks requested in the errorprone javacflags.  Move the
checks to errorprone.extra_check_modules that will always apply to
the errorprone javac run.

Fixes: 190418963
Test: m RUN_ERROR_PRONE=true StatementService
Change-Id: I342d9129cf2ca769041c1be1c82498e27db45903
---
 packages/Android.bp                  | 2 +-
 packages/StatementService/Android.bp | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/packages/Android.bp b/packages/Android.bp
index 00300150e501a..810dc565f50dc 100644
--- a/packages/Android.bp
+++ b/packages/Android.bp
@@ -24,8 +24,8 @@ package {
 
 java_defaults {
     name: "platform_app_defaults",
-    plugins: ["error_prone_android_framework"],
     errorprone: {
+        extra_check_modules: ["error_prone_android_framework"],
         javacflags: [
             // We're less worried about performance in app code
             "-Xep:AndroidFrameworkEfficientCollections:OFF",
diff --git a/packages/StatementService/Android.bp b/packages/StatementService/Android.bp
index a0d8ac9b8adcb..ff1a756479b6c 100644
--- a/packages/StatementService/Android.bp
+++ b/packages/StatementService/Android.bp
@@ -22,8 +22,7 @@ package {
 
 android_app {
     name: "StatementService",
-    // Removed because Errorprone doesn't work with Kotlin, can fix up in the future
-    // defaults: ["platform_app_defaults"],
+    defaults: ["platform_app_defaults"],
     srcs: [
         "src/**/*.java",
         "src/**/*.kt",