aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2022-03-23 02:54:41 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-03-23 02:54:41 +0000
commit661cd3505f46001cb94b65aa0fd21a3170119087 (patch)
treeb7c0ba640fd38e96068089eb744b59b100cfe192
parentc1a0e4def84e17508a07ba5a73eb746d9363aa2b (diff)
parentf3eeccc48da8236c53f348295043e4e3310beb2d (diff)
downloadturbine-android13-qpr2-s5-release.tar.gz
Update annotation stubs after upstream merge am: 88b1fee625 am: eee7a92d29 am: f3eeccc48dt_frc_odp_330442040t_frc_odp_330442000t_frc_ase_330444010android-13.0.0_r83android-13.0.0_r82android-13.0.0_r81android-13.0.0_r80android-13.0.0_r79android-13.0.0_r78android-13.0.0_r77android-13.0.0_r76android-13.0.0_r75android-13.0.0_r74android-13.0.0_r73android-13.0.0_r72android-13.0.0_r71android-13.0.0_r70android-13.0.0_r69android-13.0.0_r68android-13.0.0_r67android-13.0.0_r66android-13.0.0_r65android-13.0.0_r64android-13.0.0_r63android-13.0.0_r62android-13.0.0_r61android-13.0.0_r60android-13.0.0_r59android-13.0.0_r58android-13.0.0_r57android-13.0.0_r56android-13.0.0_r54android-13.0.0_r53android-13.0.0_r52android-13.0.0_r51android-13.0.0_r50android-13.0.0_r49android-13.0.0_r48android-13.0.0_r47android-13.0.0_r46android-13.0.0_r45android-13.0.0_r44android-13.0.0_r43android-13.0.0_r42android-13.0.0_r41android-13.0.0_r40android-13.0.0_r39android-13.0.0_r38android-13.0.0_r37android-13.0.0_r36android-13.0.0_r35android-13.0.0_r34android-13.0.0_r33android-13.0.0_r32aml_go_odp_330912000aml_go_ads_330915100aml_go_ads_330915000aml_go_ads_330913000android13-qpr3-s9-releaseandroid13-qpr3-s8-releaseandroid13-qpr3-s7-releaseandroid13-qpr3-s6-releaseandroid13-qpr3-s5-releaseandroid13-qpr3-s4-releaseandroid13-qpr3-s3-releaseandroid13-qpr3-s2-releaseandroid13-qpr3-s14-releaseandroid13-qpr3-s13-releaseandroid13-qpr3-s12-releaseandroid13-qpr3-s11-releaseandroid13-qpr3-s10-releaseandroid13-qpr3-s1-releaseandroid13-qpr3-releaseandroid13-qpr3-c-s8-releaseandroid13-qpr3-c-s7-releaseandroid13-qpr3-c-s6-releaseandroid13-qpr3-c-s5-releaseandroid13-qpr3-c-s4-releaseandroid13-qpr3-c-s3-releaseandroid13-qpr3-c-s2-releaseandroid13-qpr3-c-s12-releaseandroid13-qpr3-c-s11-releaseandroid13-qpr3-c-s10-releaseandroid13-qpr3-c-s1-releaseandroid13-qpr2-s9-releaseandroid13-qpr2-s8-releaseandroid13-qpr2-s7-releaseandroid13-qpr2-s6-releaseandroid13-qpr2-s5-releaseandroid13-qpr2-s3-releaseandroid13-qpr2-s2-releaseandroid13-qpr2-s12-releaseandroid13-qpr2-s11-releaseandroid13-qpr2-s10-releaseandroid13-qpr2-s1-releaseandroid13-qpr2-releaseandroid13-qpr2-b-s1-releaseandroid13-mainline-go-adservices-releaseandroid13-frc-odp-releaseandroid13-devandroid13-d4-s2-releaseandroid13-d4-s1-releaseandroid13-d4-releaseandroid13-d3-s1-release
Original change: https://android-review.googlesource.com/c/platform/external/turbine/+/2029126 Change-Id: Ib8d4629aae39767e14dbb17f0506fb7a2b32de11
-rwxr-xr-xandroid-annotation-stubs/gen_annotations.sh4
-rw-r--r--android-annotation-stubs/src/org/jspecify/nullness/NullMarked.java (renamed from android-annotation-stubs/src/org/checkerframework/checker/nullness/compatqual/NullableDecl.java)4
-rw-r--r--android-annotation-stubs/src/org/jspecify/nullness/Nullable.java (renamed from android-annotation-stubs/src/org/checkerframework/checker/nullness/qual/Nullable.java)2
3 files changed, 5 insertions, 5 deletions
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 PARAMETER
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
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 @@ import java.lang.annotation.Target;
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
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;