proguard: @DoNotInline and @VerifiesOn methods kept only if used

This also fixes a mistake I made in a previous CL where I was not
keeping any methods annotated by @DoNotInline.

Bug: 1094569
Change-Id: Ic6d6c5771764a8faf9d387e677423c0cd43a2091
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2249723Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Commit-Queue: Sam Maier <smaier@chromium.org>
Cr-Commit-Position: refs/heads/master@{#780804}

base/android/proguard/chromium_code.flags

@@ -76,6 +76,9 @@
 -keep,allowobfuscation class <1> {
     *** <2>(...);
 }
+-keepclassmembers,allowobfuscation class * {
+   @org.chromium.base.annotations.DoNotInline <methods>;
+}
 
 # Keep all CREATOR fields within Parcelable that are kept.
 -keepclassmembers class org.chromium.** implements android.os.Parcelable {

build/android/gyp/proguard.py

@@ -479,7 +479,7 @@ def _CreateDynamicConfig(options):
     *** <2>(...);
 }""" % annotation_name)
       ret.append("""\
--keepclassmembers,allowobfuscation,allowoptimization class ** {
+-keepclassmembers,allowobfuscation class ** {
   @%s <methods>;
 }""" % annotation_name)
   return '\n'.join(ret)

chrome/android/expectations/monochrome_public_bundle.proguard_flags.expected

@@ -258,6 +258,9 @@
 -keep,allowobfuscation class <1> {
     *** <2>(...);
 }
+-keepclassmembers,allowobfuscation class * {
+   @org.chromium.base.annotations.DoNotInline <methods>;
+}
 
 # Keep all CREATOR fields within Parcelable that are kept.
 -keepclassmembers class org.chromium.** implements android.os.Parcelable {
@@ -811,7 +814,7 @@
 -keep,allowobfuscation class <1> {
     *** <2>(...);
 }
--keepclassmembers,allowobfuscation,allowoptimization class ** {
+-keepclassmembers,allowobfuscation class ** {
   @org.chromium.base.annotations.VerifiesOnNMR1 <methods>;
 }
 -keep @interface org.chromium.base.annotations.VerifiesOnO
@@ -821,7 +824,7 @@
 -keep,allowobfuscation class <1> {
     *** <2>(...);
 }
--keepclassmembers,allowobfuscation,allowoptimization class ** {
+-keepclassmembers,allowobfuscation class ** {
   @org.chromium.base.annotations.VerifiesOnO <methods>;
 }
 -keep @interface org.chromium.base.annotations.VerifiesOnOMR1
@@ -831,7 +834,7 @@
 -keep,allowobfuscation class <1> {
     *** <2>(...);
 }
--keepclassmembers,allowobfuscation,allowoptimization class ** {
+-keepclassmembers,allowobfuscation class ** {
   @org.chromium.base.annotations.VerifiesOnOMR1 <methods>;
 }
 -keep @interface org.chromium.base.annotations.VerifiesOnP
@@ -841,7 +844,7 @@
 -keep,allowobfuscation class <1> {
     *** <2>(...);
 }
--keepclassmembers,allowobfuscation,allowoptimization class ** {
+-keepclassmembers,allowobfuscation class ** {
   @org.chromium.base.annotations.VerifiesOnP <methods>;
 }
 -keep @interface org.chromium.base.annotations.VerifiesOnQ
@@ -851,6 +854,6 @@
 -keep,allowobfuscation class <1> {
     *** <2>(...);
 }
--keepclassmembers,allowobfuscation,allowoptimization class ** {
+-keepclassmembers,allowobfuscation class ** {
   @org.chromium.base.annotations.VerifiesOnQ <methods>;
 }