Fixing DoNotInline to actually prevent inlining

Binary-Size: We were mistakenly not doing this
Bug: 965189
Change-Id: I03f64ec6b81ab9da97b3ef9258c7dec17706f91d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1730845
Commit-Queue: Sam Maier <smaier@chromium.org>
Commit-Queue: Tibor Goldschwendt <tiborg@chromium.org>
Auto-Submit: Sam Maier <smaier@chromium.org>
Reviewed-by: Tibor Goldschwendt <tiborg@chromium.org>
Cr-Commit-Position: refs/heads/master@{#683660}

base/android/proguard/chromium_code.flags

@@ -49,10 +49,10 @@
 
 # Never inline classes or methods with this annotation, but allow shrinking and
 # obfuscation.
--keepnames,allowobfuscation @org.chromium.base.annotations.DoNotInline class ** {
-  *;
+-keep,allowobfuscation,allowoptimization @org.chromium.base.annotations.DoNotInline class ** {
+  <methods>;
 }
--keepclassmembernames,allowobfuscation class ** {
+-keepclassmembers,allowobfuscation,allowoptimization class ** {
   @org.chromium.base.annotations.DoNotInline <methods>;
 }
 

chrome/android/java/monochrome_public_bundle.proguard_flags.expected

@@ -222,10 +222,10 @@
 
 # Never inline classes or methods with this annotation, but allow shrinking and
 # obfuscation.
--keepnames,allowobfuscation @org.chromium.base.annotations.DoNotInline class ** {
-  *;
+-keep,allowobfuscation,allowoptimization @org.chromium.base.annotations.DoNotInline class ** {
+  <methods>;
 }
--keepclassmembernames,allowobfuscation class ** {
+-keepclassmembers,allowobfuscation,allowoptimization class ** {
   @org.chromium.base.annotations.DoNotInline <methods>;
 }