commit 480cc2d574d1bbd23210760735c6643ecb6b07b8
author Mads Ager <ager@google.com> Thu May 24 13:46:54 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu May 24 13:46:54 2018 +0000
tree 025ac2c2e344f24fecb172d4de6b8a7b3ffe7ecf
parent 549cd04d5e840e334a0618fc319199ac318b36bc
parent ea01cfd546bcdb7fbea420244ef5b3d4868fda0b

Merge "Add simple flag file support to D8 and R8."

src/main/java/com/android/tools/r8/ir/desugar/CovariantReturnTypeAnnotationTransformer.java

diff --git a/src/main/java/com/android/tools/r8/ir/desugar/CovariantReturnTypeAnnotationTransformer.java b/src/main/java/com/android/tools/r8/ir/desugar/CovariantReturnTypeAnnotationTransformer.java
index 64fe450..526bd9f 100644
--- a/src/main/java/com/android/tools/r8/ir/desugar/CovariantReturnTypeAnnotationTransformer.java
+++ b/src/main/java/com/android/tools/r8/ir/desugar/CovariantReturnTypeAnnotationTransformer.java
@@ -159,6 +159,7 @@
         factory.createProto(
             covariantReturnType, method.method.proto.shorty, method.method.proto.parameters);
     MethodAccessFlags newAccessFlags = method.accessFlags.copy();
+    newAccessFlags.setBridge();
     newAccessFlags.setSynthetic();
     DexEncodedMethod newVirtualMethod =
         new DexEncodedMethod(