summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFedor Kudasov <kudasov@google.com>2022-02-16 13:51:50 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-02-16 13:51:50 +0000
commit70c73c4bdd0f3b2fa15b557e439ac32b85c0f127 (patch)
treecc2bc1f66266d5b0073b41dd63c86e0a2448a677
parentfbdafdc7fcd0eb78c88a3480c7e336377541cfca (diff)
parent7f2995b5f9004e8d387c38f98673b20229cae639 (diff)
downloaderror_prone-70c73c4bdd0f3b2fa15b557e439ac32b85c0f127.tar.gz
Build dataflow-nullaway from dataflow-errorprone am: c9c4b7efa3 am: f25287c68a am: 7f2995b5f9
Original change: https://android-review.googlesource.com/c/platform/external/error_prone/+/1984999 Change-Id: Ibdc977c21238cdbeab48e03ca8a60ff4350fa89b
-rw-r--r--checkerframework/Android.bp8
-rw-r--r--checkerframework/nullaway-jarjar-rules.txt2
2 files changed, 10 insertions, 0 deletions
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 @@ java_import {
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"],
+}
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