Merge "Re-enable nullaway plugin" into main

2023-12-01 08:22:21 +00:00
parent dbaf12441f b4598567fc
commit 8fc2b3429e
1 changed files with 6 additions and 7 deletions
--- a/Android.bp
+++ b/Android.bp
@@ -107,13 +107,12 @@ android_library {

    plugins: ["androidx.room_room-compiler-plugin"],

-    // TODO: b/307330031 - Re-enable the nullaway plugin when the issue is fixed.
-    // errorprone: {
-    //     extra_check_modules: ["//external/nullaway:nullaway_plugin"],
-    //     javacflags: [
-    //         "-XepOpt:NullAway:AnnotatedPackages=com.android.settings",
-    //     ],
-    // },
+    errorprone: {
+        extra_check_modules: ["//external/nullaway:nullaway_plugin"],
+        javacflags: [
+            "-XepOpt:NullAway:AnnotatedPackages=com.android.settings",
+        ],
+    },

    libs: [
        "telephony-common",