Annotated functions/classes more cleanly kept

chrome/android/java/proguard.flags

Index: chrome/android/java/proguard.flags
diff --git a/chrome/android/java/proguard.flags b/chrome/android/java/proguard.flags
index 59ce6b7c21f2cbca1ad75556926e7704b0368503..acfa41809b4c5878a37dc4f57f1512e012d01bde 100644
--- a/chrome/android/java/proguard.flags
+++ b/chrome/android/java/proguard.flags
@@ -15,54 +15,50 @@
 -keep public class org.chromium** extends android.app.Fragment
 
 # Keeps for class level annotations.
--keep @**.UsedByReflection class *
--keep @**.VisibleForTesting class *
+-keep @org.chromium.base.annotations.UsedByReflection class com.google.android.apps.chrome.**

[agrieve, 2016/07/15 14:44:34]

I think we're fine to leave the right-hand-side of this as "class *". I don't
know why we'd not have code in our namespace, but if we did, I'd want the
annotation to still work.

I think we should probably do the same for the -kepclasseswithmembers below as
well.  Now that we've being more specific on the annotation class, we can relax
the right-hand side (and have fewer lines, yay!)

+-keep @org.chromium.base.annotations.UsedByReflection class org.chromium.**
+-keep @org.chromium.base.VisibleForTesting class com.google.android.apps.chrome.**
+-keep @org.chromium.base.VisibleForTesting class org.chromium.**
 
 # Keeps for method level annotations.
 -keepclasseswithmembers class com.google.android.apps.chrome.** {
-  @**.AccessedByNative <fields>;
+  @org.chromium.base.annotations.AccessedByNative <fields>;
 }
 -keepclasseswithmembers class com.google.android.apps.chrome.** {
-  @**.CalledByNative <methods>;
+  @org.chromium.base.annotations.CalledByNative <methods>;
 }
 -keepclasseswithmembers class com.google.android.apps.chrome.** {
-  @**.CalledByNativeUnchecked <methods>;
+  @org.chromium.base.annotations.CalledByNativeUnchecked <methods>;
 }
 -keepclasseswithmembers class com.google.android.apps.chrome.** {
-  @**.JavascriptInterface <methods>;
+  @org.chromium.base.annotations.NativeCall <methods>;
 }
 -keepclasseswithmembers class com.google.android.apps.chrome.** {
-  @**.NativeCall <methods>;
+  @org.chromium.base.annotations.UsedByReflection <methods>;
 }
 -keepclasseswithmembers class com.google.android.apps.chrome.** {
-  @**.UsedByReflection <methods>;
-}
--keepclasseswithmembers class com.google.android.apps.chrome.** {
-  @**.VisibleForTesting <methods>;
+  @org.chromium.base.VisibleForTesting <methods>;
 }
 -keepclasseswithmembers class com.google.android.apps.chrome.** {
   native <methods>;
 }
 -keepclasseswithmembers class org.chromium.** {
-  @**.AccessedByNative <fields>;
-}
--keepclasseswithmembers class org.chromium.** {
-  @**.CalledByNative <methods>;
+  @org.chromium.base.annotations.AccessedByNative <fields>;
 }
 -keepclasseswithmembers class org.chromium.** {
-  @**.CalledByNativeUnchecked <methods>;
+  @org.chromium.base.annotations.CalledByNative <methods>;
 }
 -keepclasseswithmembers class org.chromium.** {
-  @**.JavascriptInterface <methods>;
+  @org.chromium.base.annotations.CalledByNativeUnchecked <methods>;
 }
 -keepclasseswithmembers class org.chromium.** {
-  @**.NativeCall <methods>;
+  @org.chromium.base.annotations.NativeCall <methods>;
 }
 -keepclasseswithmembers class org.chromium.** {
-  @**.UsedByReflection <methods>;
+  @org.chromium.base.annotations.UsedByReflection <methods>;
 }
 -keepclasseswithmembers class org.chromium.** {
-  @**.VisibleForTesting <methods>;
+  @org.chromium.base.VisibleForTesting <methods>;
 }
 -keepclasseswithmembers class org.chromium.** {
   native <methods>;