| commit | 661cd3505f46001cb94b65aa0fd21a3170119087 | [log] [tgz] |
|---|---|---|
| author | Colin Cross <ccross@android.com> | Wed Mar 23 02:54:41 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Mar 23 02:54:41 2022 +0000 |
| tree | b7c0ba640fd38e96068089eb744b59b100cfe192 | |
| parent | c1a0e4def84e17508a07ba5a73eb746d9363aa2b [diff] | |
| parent | f3eeccc48da8236c53f348295043e4e3310beb2d [diff] |
Update annotation stubs after upstream merge am: 88b1fee625 am: eee7a92d29 am: f3eeccc48d Original change: https://android-review.googlesource.com/c/platform/external/turbine/+/2029126 Change-Id: Ib8d4629aae39767e14dbb17f0506fb7a2b32de11
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;