Conditional keeps for verifies stuff

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

base/android/proguard/chromium_code.flags

@@ -70,11 +70,11 @@
 
 # Never inline classes or methods with this annotation, but allow shrinking and
 # obfuscation.
--keepclassmembers,allowobfuscation,allowoptimization @org.chromium.base.annotations.DoNotInline class ** {
-  <methods>;
+-if @org.chromium.base.annotations.DoNotInline class * {
+    *** *(...);
 }
--keepclassmembers,allowobfuscation,allowoptimization class ** {
-  @org.chromium.base.annotations.DoNotInline <methods>;
+-keep,allowobfuscation class <1> {
+    *** <2>(...);
 }
 
 # Keep all CREATOR fields within Parcelable that are kept.

build/android/gyp/proguard.py

@@ -472,8 +472,11 @@ def _CreateDynamicConfig(options):
     if api_level > _min_api:
       ret.append('-keep @interface %s' % annotation_name)
       ret.append("""\
--keepclassmembers,allowobfuscation,allowoptimization @%s class ** {
-  <methods>;
+-if @%s class * {
+    *** *(...);
+}
+-keep,allowobfuscation class <1> {
+    *** <2>(...);
 }""" % annotation_name)
       ret.append("""\
 -keepclassmembers,allowobfuscation,allowoptimization class ** {

chrome/android/java/monochrome_public_bundle.proguard_flags.expected

@@ -252,11 +252,11 @@
 
 # Never inline classes or methods with this annotation, but allow shrinking and
 # obfuscation.
--keepclassmembers,allowobfuscation,allowoptimization @org.chromium.base.annotations.DoNotInline class ** {
-  <methods>;
+-if @org.chromium.base.annotations.DoNotInline class * {
+    *** *(...);
 }
--keepclassmembers,allowobfuscation,allowoptimization class ** {
-  @org.chromium.base.annotations.DoNotInline <methods>;
+-keep,allowobfuscation class <1> {
+    *** <2>(...);
 }
 
 # Keep all CREATOR fields within Parcelable that are kept.
@@ -794,36 +794,51 @@
 ################################################################################
 # THIS LINE WAS OMITTED
 -keep @interface org.chromium.base.annotations.VerifiesOnNMR1
--keepclassmembers,allowobfuscation,allowoptimization @org.chromium.base.annotations.VerifiesOnNMR1 class ** {
-  <methods>;
+-if @org.chromium.base.annotations.VerifiesOnNMR1 class * {
+    *** *(...);
+}
+-keep,allowobfuscation class <1> {
+    *** <2>(...);
 }
 -keepclassmembers,allowobfuscation,allowoptimization class ** {
   @org.chromium.base.annotations.VerifiesOnNMR1 <methods>;
 }
 -keep @interface org.chromium.base.annotations.VerifiesOnO
--keepclassmembers,allowobfuscation,allowoptimization @org.chromium.base.annotations.VerifiesOnO class ** {
-  <methods>;
+-if @org.chromium.base.annotations.VerifiesOnO class * {
+    *** *(...);
+}
+-keep,allowobfuscation class <1> {
+    *** <2>(...);
 }
 -keepclassmembers,allowobfuscation,allowoptimization class ** {
   @org.chromium.base.annotations.VerifiesOnO <methods>;
 }
 -keep @interface org.chromium.base.annotations.VerifiesOnOMR1
--keepclassmembers,allowobfuscation,allowoptimization @org.chromium.base.annotations.VerifiesOnOMR1 class ** {
-  <methods>;
+-if @org.chromium.base.annotations.VerifiesOnOMR1 class * {
+    *** *(...);
+}
+-keep,allowobfuscation class <1> {
+    *** <2>(...);
 }
 -keepclassmembers,allowobfuscation,allowoptimization class ** {
   @org.chromium.base.annotations.VerifiesOnOMR1 <methods>;
 }
 -keep @interface org.chromium.base.annotations.VerifiesOnP
--keepclassmembers,allowobfuscation,allowoptimization @org.chromium.base.annotations.VerifiesOnP class ** {
-  <methods>;
+-if @org.chromium.base.annotations.VerifiesOnP class * {
+    *** *(...);
+}
+-keep,allowobfuscation class <1> {
+    *** <2>(...);
 }
 -keepclassmembers,allowobfuscation,allowoptimization class ** {
   @org.chromium.base.annotations.VerifiesOnP <methods>;
 }
 -keep @interface org.chromium.base.annotations.VerifiesOnQ
--keepclassmembers,allowobfuscation,allowoptimization @org.chromium.base.annotations.VerifiesOnQ class ** {
-  <methods>;
+-if @org.chromium.base.annotations.VerifiesOnQ class * {
+    *** *(...);
+}
+-keep,allowobfuscation class <1> {
+    *** <2>(...);
 }
 -keepclassmembers,allowobfuscation,allowoptimization class ** {
   @org.chromium.base.annotations.VerifiesOnQ <methods>;