diff options
| author | 2025-01-24 10:26:31 -0800 | |
|---|---|---|
| committer | 2025-01-24 10:26:31 -0800 | |
| commit | 5aae4e2a4dfe18eda786e6940b373dfca41b9675 (patch) | |
| tree | 868e5fa7c5b56db4a0cc679824e58d8092a0f558 /ravenwood/texts | |
| parent | b11886a43a1c9894250bc117ea16abd88911819f (diff) | |
| parent | 826cc8b1a88d4ef527da169b00a4863cd5253cf6 (diff) | |
Merge "[ravenwood] Promote "ignore" to an annotation" into main am: cb42d80c50 am: 826cc8b1a8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3463811
Change-Id: Iba86f07f516adb43258b66974af5c8e701a0cc92
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'ravenwood/texts')
| -rw-r--r-- | ravenwood/texts/ravenwood-framework-policies.txt | 2 | ||||
| -rw-r--r-- | ravenwood/texts/ravenwood-standard-options.txt | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/ravenwood/texts/ravenwood-framework-policies.txt b/ravenwood/texts/ravenwood-framework-policies.txt index 4033782c607e..fff9e6ad41d5 100644 --- a/ravenwood/texts/ravenwood-framework-policies.txt +++ b/ravenwood/texts/ravenwood-framework-policies.txt @@ -62,4 +62,4 @@ class android.text.ClipboardManager keep # no-pta # Just enough to allow ResourcesManager to run class android.hardware.display.DisplayManagerGlobal keep # no-pta - method getInstance ()Landroid/hardware/display/DisplayManagerGlobal; ignore + method getInstance ()Landroid/hardware/display/DisplayManagerGlobal; ignore # no-pta diff --git a/ravenwood/texts/ravenwood-standard-options.txt b/ravenwood/texts/ravenwood-standard-options.txt index 27223d8b72ff..91fd9283aff2 100644 --- a/ravenwood/texts/ravenwood-standard-options.txt +++ b/ravenwood/texts/ravenwood-standard-options.txt @@ -31,6 +31,9 @@ --remove-annotation android.ravenwood.annotation.RavenwoodRemove +--ignore-annotation + android.ravenwood.annotation.RavenwoodIgnore + --substitute-annotation android.ravenwood.annotation.RavenwoodReplace |