Annotated functions/classes more cleanly kept

android_webview/apk/java/proguard.flags

Index: android_webview/apk/java/proguard.flags
diff --git a/android_webview/apk/java/proguard.flags b/android_webview/apk/java/proguard.flags
index ae25fbb147084a0015236e64057f0d7056cccfdf..d4a0a47e26b72b6a2c2919df5d5c51a7697b340c 100644
--- a/android_webview/apk/java/proguard.flags
+++ b/android_webview/apk/java/proguard.flags
@@ -3,19 +3,6 @@
 # tables.
 -keepnames class *** { *; }
 
-# Keep source file and line number information for stack traces.
--keepattributes SourceFile,LineNumberTable
-
-# Keep all runtime visible annotations.
--keepattributes RuntimeVisibleAnnotations
-# Keeping annotations - if we remove these keeps, ProGuard will eliminate the
-# annotations themselves, which will prevent them from affecting ProGuard's
-# optimization run.
--keep @interface **.AccessedByNative
--keep @interface **.CalledByNative
--keep @interface **.CalledByNativeUnchecked
--keep @interface **.RemovableInRelease
--keep @interface **.UsedByReflection
 
 # Keep the factory and its public members; it's the main entry point used by the
 # framework.
@@ -29,42 +16,6 @@
   public *;
 }
 
-# Keep JNI interfaces.
--keepclasseswithmembers class com.android.webview.chromium.**,org.chromium.** {
-  @**.AccessedByNative <fields>;
-}
--keepclasseswithmembers class com.android.webview.chromium.**,org.chromium.** {
-  @**.CalledByNative <methods>;
-}
--keepclasseswithmembers class com.android.webview.chromium.**,org.chromium.** {
-  @**.CalledByNativeUnchecked <methods>;
-}
--keepclasseswithmembers class com.android.webview.chromium.**,org.chromium.** {
-  native <methods>;
-}
-
-# Keep classes marked as used by reflection
--keep @**.UsedByReflection class com.android.webview.chromium.**,org.chromium.**
-
-# Keep members explicitly marked as used by reflection
--keepclasseswithmembers class com.android.webview.chromium.**,org.chromium.** {
-  @**.UsedByReflection *;
-}
-
-# Remove methods annotated with this if their return value is unused
--assumenosideeffects class ** {
-  @org.chromium.base.annotations.RemovableInRelease <methods>;
-}
-
-# Allows Proguard freedom in removing these log related calls. We ask for debug
-# and verbose logs to be stripped out in base.Log, so we are just ensuring we
-# get rid of all other debug/verbose logs.
--assumenosideeffects class android.util.Log {
-  static *** d(...);
-  static *** v(...);
-  static *** isLoggable(...);
-}
-
 # Linker dynamically casts to $TestRunner when running tests. We don't run these
 # tests in WebView.
 -dontnote org.chromium.base.library_loader.Linker$TestRunner
@@ -112,11 +63,3 @@
 # may reference classes no longer in the SDK.
 -dontnote android.support.**
 -dontwarn android.support.**
-
-# Keep all enum values and valueOf methods. See
-# http://proguard.sourceforge.net/index.html#manual/examples.html
-# for the reason for this. Also, see http://crbug.com/248037.
--keepclassmembers enum * {
-    public static **[] values();
-    public static ** valueOf(java.lang.String);
-}