commit 1707bae46ae11b131478d994d7371241960a8427
author Artur Satayev <satayev@google.com> Tue Dec 10 12:00:02 2019 +0000
committer Treehugger Robot <treehugger-gerrit@google.com> Tue Dec 10 13:03:25 2019 +0000
tree 9b4983b7cf0509660f8c1e36ce0a2938a3fa9f64
parent 0e33d0e1599e2299d5f1dd6dbc6022fc3df8c53e

Support new UnsupportedAppUsage in class2greylist.

This is temporarily needed while we are migrating to the new annotation; the old two annotations will be shortly deleted.

Bug: 145132366
Test: m && diff unsupportedappusage_index.csv
Change-Id: I440f48aeccf0c7c3ae527370be76372334eff8db

tools/class2greylist/src/com/android/class2greylist/Class2Greylist.java

diff --git a/tools/class2greylist/src/com/android/class2greylist/Class2Greylist.java b/tools/class2greylist/src/com/android/class2greylist/Class2Greylist.java
index e7e9716..998af9b 100644
--- a/tools/class2greylist/src/com/android/class2greylist/Class2Greylist.java
+++ b/tools/class2greylist/src/com/android/class2greylist/Class2Greylist.java
@@ -49,6 +49,7 @@
     private static final Set<String> GREYLIST_ANNOTATIONS =
             ImmutableSet.of(
                     "android.annotation.UnsupportedAppUsage",
+                    "android.compat.annotation.UnsupportedAppUsage",
                     "dalvik.annotation.compat.UnsupportedAppUsage");
     private static final Set<String> WHITELIST_ANNOTATIONS = ImmutableSet.of();