commit 7f2995b5f9004e8d387c38f98673b20229cae639
author Fedor Kudasov <kudasov@google.com> Wed Feb 16 13:33:32 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Feb 16 13:33:32 2022 +0000
tree cc2bc1f66266d5b0073b41dd63c86e0a2448a677
parent 7d361ca9243553b5184bba1215fd18a4140405f0
parent f25287c68ad4ad144d42a4d084f7f4b266f0ae32

Build dataflow-nullaway from dataflow-errorprone am: c9c4b7efa3 am: f25287c68a

Original change: https://android-review.googlesource.com/c/platform/external/error_prone/+/1984999

Change-Id: I96e96155fffceaba3e5bf1e4011fc388046e623f

checkerframework/Android.bp

diff --git a/checkerframework/Android.bp b/checkerframework/Android.bp
index 261e2e3..bd43afd 100644
--- a/checkerframework/Android.bp
+++ b/checkerframework/Android.bp
@@ -32,3 +32,11 @@
     host_supported: true,
     jars: ["dataflow-errorprone-3.21.2.jar"],
 }
+
+// This is effectively dataflow-nullaway library
+java_library_host {
+    name: "error_prone_checkerframework_dataflow_nullaway",
+    visibility: ["//external/nullaway"],
+    jarjar_rules: "nullaway-jarjar-rules.txt",
+    static_libs: ["error_prone_checkerframework_dataflow_errorprone"],
+}

checkerframework/nullaway-jarjar-rules.txt

diff --git a/checkerframework/nullaway-jarjar-rules.txt b/checkerframework/nullaway-jarjar-rules.txt
new file mode 100644
index 0000000..b8b72a2
--- /dev/null
+++ b/checkerframework/nullaway-jarjar-rules.txt
@@ -0,0 +1,2 @@
+# Replace all errorprone packages with nullaway packages
+rule org.checkerframework.errorprone.** org.checkerframework.nullaway.@1