Snap for 8191477 from 70c73c4bdd0f3b2fa15b557e439ac32b85c0f127 to tm-release
Change-Id: Iea4a81aebaaca3e80f331641ece2fd0c178904aa
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"],
+}
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
