diff options
| author | 2021-06-25 13:33:19 -0700 | |
|---|---|---|
| committer | 2021-06-25 13:35:40 -0700 | |
| commit | f89e732dc64b418b0677e159a3175fdec879d2c8 (patch) | |
| tree | d2aa504479cf9d0b9f06d1b72e09eac7a2822660 | |
| parent | 2903ad550b21bb5ea71c9d655f350957e6bf02da (diff) | |
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
| -rw-r--r-- | packages/Android.bp | 2 | ||||
| -rw-r--r-- | packages/StatementService/Android.bp | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/packages/Android.bp b/packages/Android.bp index 00300150e501..810dc565f50d 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 a0d8ac9b8adc..ff1a756479b6 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", |