Reland "Android: Remove proguard flags related to VerifiesOnX"
This reverts commit e4be6cc9455e9ca4419c340509f266669a76625a.
Reason for revert: R8 updated
Original change's description:
> Revert "Android: Remove proguard flags related to VerifiesOnX"
>
> This reverts commit ea6f65e2329fee856f0066c3df427b6fc7cd0d72.
>
> Reason for revert: Perf regression
>
> Original change's description:
> > Android: Remove proguard flags related to VerifiesOnX
> >
> > The latest R8 roll now prevents inlining when doing so would cause
> > verification failures.
> >
> > Bug: 1266453
> > Change-Id: I053789ab27c1264a8a2956e0ace2fde144acabd2
> > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3259306
> > Auto-Submit: Andrew Grieve <agrieve@chromium.org>
> > Reviewed-by: Sam Maier <smaier@chromium.org>
> > Commit-Queue: Andrew Grieve <agrieve@chromium.org>
> > Cr-Commit-Position: refs/heads/main@{#938160}
>
> Bug: 1266453, 1266839
> Change-Id: I82447958383e73e637fa92d909c25480cb9904ba
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3262618
> Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
> Commit-Queue: Andrew Grieve <agrieve@chromium.org>
> Cr-Commit-Position: refs/heads/main@{#938617}
Bug: 1266453, 1266839
Change-Id: If724da98843a10fef893b4f688439bb45d91b34b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3462549
Reviewed-by: Sam Maier <smaier@chromium.org>
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/main@{#971212}
diff --git a/build/android/docs/class_verification_failures.md b/build/android/docs/class_verification_failures.md
index e3e4745..d42937a 100644
--- a/build/android/docs/class_verification_failures.md
+++ b/build/android/docs/class_verification_failures.md
@@ -127,7 +127,6 @@
* These need to exist in a separate class so that Android framework can successfully verify
* classes without encountering the new APIs.
*/
-@VerifiesOnOMR1
@TargetApi(Build.VERSION_CODES.O_MR1)
public class ApiHelperForOMR1 {
private ApiHelperForOMR1() {}
@@ -136,15 +135,14 @@
}
```
-* `@VerifiesOnO_MR1`: this is a chromium-defined annotation to tell proguard
- (and similar tools) not to inline this class or its methods (since that would
- defeat the point of out-of-lining!)
* `@TargetApi(Build.VERSION_CODES.O_MR1)`: this tells Android Lint it's OK to
use OMR1 APIs since this class is only used on OMR1 and above. Substitute
`O_MR1` for the [appropriate constant][4], depending when the APIs were
introduced.
* Don't put any `SDK_INT` checks inside this class, because it must only be
called on >= OMR1.
+* R8 is smart enough not to inline methods where doing so would introduce
+ verification failures (b/138781768)
### Out-of-lining if your method has a new type in its signature
