Update annotation stubs after upstream merge
Upstream uses org.jspecify.nullness instead of
org.checkerframework.checker.nullness.compatqual now.
Bug: 225013372
Test: m turbine
Change-Id: I6296f96b44d59d48b0d88642143a858c69d8ae8d
diff --git a/android-annotation-stubs/gen_annotations.sh b/android-annotation-stubs/gen_annotations.sh
index 1965324..b2bb170 100755
--- a/android-annotation-stubs/gen_annotations.sh
+++ b/android-annotation-stubs/gen_annotations.sh
@@ -5,8 +5,8 @@
declare -A IMPORT
ANNOTATIONS=(
- org.checkerframework.checker.nullness.qual.Nullable
- org.checkerframework.checker.nullness.compatqual.NullableDecl
+ org.jspecify.nullness.Nullable
+ org.jspecify.nullness.NullMarked
)
for a in ${ANNOTATIONS[@]}; do
diff --git a/android-annotation-stubs/src/org/checkerframework/checker/nullness/compatqual/NullableDecl.java b/android-annotation-stubs/src/org/jspecify/nullness/NullMarked.java
similarity index 92%
rename from android-annotation-stubs/src/org/checkerframework/checker/nullness/compatqual/NullableDecl.java
rename to android-annotation-stubs/src/org/jspecify/nullness/NullMarked.java
index 2d39b0f..ef4b562 100644
--- a/android-annotation-stubs/src/org/checkerframework/checker/nullness/compatqual/NullableDecl.java
+++ b/android-annotation-stubs/src/org/jspecify/nullness/NullMarked.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.checkerframework.checker.nullness.compatqual;
+package org.jspecify.nullness;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
@@ -37,4 +37,4 @@
ElementType.TYPE_USE
})
@Retention(RetentionPolicy.SOURCE)
-public @interface NullableDecl {}
+public @interface NullMarked {}
diff --git a/android-annotation-stubs/src/org/checkerframework/checker/nullness/qual/Nullable.java b/android-annotation-stubs/src/org/jspecify/nullness/Nullable.java
similarity index 95%
rename from android-annotation-stubs/src/org/checkerframework/checker/nullness/qual/Nullable.java
rename to android-annotation-stubs/src/org/jspecify/nullness/Nullable.java
index 276d64c..7156d51 100644
--- a/android-annotation-stubs/src/org/checkerframework/checker/nullness/qual/Nullable.java
+++ b/android-annotation-stubs/src/org/jspecify/nullness/Nullable.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.checkerframework.checker.nullness.qual;
+package org.jspecify.nullness;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;