summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 2024-12-06 21:12:22 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2024-12-06 21:12:22 +0000
commit479f1fcdbacf43b07688b200ec0a93fa1e87e442 (patch)
tree9207e0577f60cfab0fc7959395be3c29b999f81f
parentec8d5f2dce7351a340231e02fc19c586cf4059a7 (diff)
parent71a028d9e4e95e318fbd8ad231da84a6f971359a (diff)
Merge "Do not emit FlaggedApi annotations in core-current-stubs-for-system-modules-no-annotations." into main am: 71a028d9e4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3392636 Change-Id: I7dc84f66e13feced6ba33573afbb628579d772f9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--java/core-libraries/jarjar-strip-annotations-rules.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/java/core-libraries/jarjar-strip-annotations-rules.txt b/java/core-libraries/jarjar-strip-annotations-rules.txt
index a1c261b9a..c74eaca49 100644
--- a/java/core-libraries/jarjar-strip-annotations-rules.txt
+++ b/java/core-libraries/jarjar-strip-annotations-rules.txt
@@ -2,3 +2,4 @@ strip-annotation android.annotation.NotNull
strip-annotation android.annotation.Nullable
strip-annotation androidx.annotation.RecentlyNonNull
strip-annotation androidx.annotation.RecentlyNullable
+strip-annotation android.annotation.FlaggedApi