summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Makoto Onuki <omakoto@google.com> 2024-09-20 20:16:06 +0000
committer Android Build Cherrypicker Worker <android-build-cherrypicker-worker@google.com> 2024-09-20 20:16:06 +0000
commita17acd7f11f7bc946832120099b72836fadc6bfb (patch)
tree993d65da09a7a666699bf6f21d1064b44d7bb6c1
parent42ebed4a2f45319d677a7b764ba9b5797714f10a (diff)
Allow to add a bug number to ravenwood annotations
Flag: EXEMPT host test change only Bug: 292141694 Test: treehugger (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:7aca35e22dd73d7277821f46dd1869777cafe507) Merged-In: I50389646482067671f1df6f159561e9058eca4e3 Change-Id: I50389646482067671f1df6f159561e9058eca4e3
-rw-r--r--ravenwood/annotations-src/android/ravenwood/annotation/RavenwoodRemove.java14
-rw-r--r--ravenwood/annotations-src/android/ravenwood/annotation/RavenwoodReplace.java5
-rw-r--r--ravenwood/annotations-src/android/ravenwood/annotation/RavenwoodThrow.java5
-rw-r--r--ravenwood/junit-src/android/platform/test/annotations/DisabledOnRavenwood.java5
-rw-r--r--ravenwood/junit-src/android/platform/test/annotations/IgnoreUnderRavenwood.java5
5 files changed, 34 insertions, 0 deletions
diff --git a/ravenwood/annotations-src/android/ravenwood/annotation/RavenwoodRemove.java b/ravenwood/annotations-src/android/ravenwood/annotation/RavenwoodRemove.java
index 6727327c99be..b69c63748d81 100644
--- a/ravenwood/annotations-src/android/ravenwood/annotation/RavenwoodRemove.java
+++ b/ravenwood/annotations-src/android/ravenwood/annotation/RavenwoodRemove.java
@@ -35,4 +35,18 @@ import java.lang.annotation.Target;
@Target({TYPE, FIELD, METHOD, CONSTRUCTOR})
@Retention(RetentionPolicy.CLASS)
public @interface RavenwoodRemove {
+ /**
+ * One or more classes that aren't yet supported by Ravenwood, which is why this method throws.
+ */
+ Class<?>[] blockedBy() default {};
+
+ /**
+ * General free-form description of why this method throws.
+ */
+ String reason() default "";
+
+ /**
+ * Tracking bug number, if any.
+ */
+ long bug() default 0;
}
diff --git a/ravenwood/annotations-src/android/ravenwood/annotation/RavenwoodReplace.java b/ravenwood/annotations-src/android/ravenwood/annotation/RavenwoodReplace.java
index 83a7b6e54389..57cdfd2240d0 100644
--- a/ravenwood/annotations-src/android/ravenwood/annotation/RavenwoodReplace.java
+++ b/ravenwood/annotations-src/android/ravenwood/annotation/RavenwoodReplace.java
@@ -42,4 +42,9 @@ public @interface RavenwoodReplace {
* General free-form description of why this method is being replaced.
*/
String reason() default "";
+
+ /**
+ * Tracking bug number, if any.
+ */
+ long bug() default 0;
}
diff --git a/ravenwood/annotations-src/android/ravenwood/annotation/RavenwoodThrow.java b/ravenwood/annotations-src/android/ravenwood/annotation/RavenwoodThrow.java
index 0bb1f39cd453..19e6af1c478d 100644
--- a/ravenwood/annotations-src/android/ravenwood/annotation/RavenwoodThrow.java
+++ b/ravenwood/annotations-src/android/ravenwood/annotation/RavenwoodThrow.java
@@ -43,4 +43,9 @@ public @interface RavenwoodThrow {
* General free-form description of why this method throws.
*/
String reason() default "";
+
+ /**
+ * Tracking bug number, if any.
+ */
+ long bug() default 0;
}
diff --git a/ravenwood/junit-src/android/platform/test/annotations/DisabledOnRavenwood.java b/ravenwood/junit-src/android/platform/test/annotations/DisabledOnRavenwood.java
index 1adb0f31da54..470165c6da43 100644
--- a/ravenwood/junit-src/android/platform/test/annotations/DisabledOnRavenwood.java
+++ b/ravenwood/junit-src/android/platform/test/annotations/DisabledOnRavenwood.java
@@ -51,4 +51,9 @@ public @interface DisabledOnRavenwood {
* General free-form description of why this test is being ignored.
*/
String reason() default "";
+
+ /**
+ * Tracking bug number, if any.
+ */
+ long bug() default 0;
}
diff --git a/ravenwood/junit-src/android/platform/test/annotations/IgnoreUnderRavenwood.java b/ravenwood/junit-src/android/platform/test/annotations/IgnoreUnderRavenwood.java
index 7faa654b903c..1c06829dba06 100644
--- a/ravenwood/junit-src/android/platform/test/annotations/IgnoreUnderRavenwood.java
+++ b/ravenwood/junit-src/android/platform/test/annotations/IgnoreUnderRavenwood.java
@@ -51,4 +51,9 @@ public @interface IgnoreUnderRavenwood {
* General free-form description of why this test is being ignored.
*/
String reason() default "";
+
+ /**
+ * Tracking bug number, if any.
+ */
+ long bug() default 0;
}