commit a1bb705d054ffb970aa607e06fd360c5e77013b8
author Christoffer Quist Adamsen <christofferqa@google.com> Mon Nov 25 20:50:10 2019 +0100
committer Christoffer Quist Adamsen <christofferqa@google.com> Tue Nov 26 15:30:52 2019 +0000
tree ece3add3d72e6a82e1259e8544c781366e9475eb
parent 580a95acf47e70c492e70d68265a590d2428d49d

Allow abstract methods on non-abstract classes

Bug: 144886554
Change-Id: I359c37f8a7dcb863f5b1f3d695267bf0add16a37

src/main/java/com/android/tools/r8/shaking/TreePruner.java

diff --git a/src/main/java/com/android/tools/r8/shaking/TreePruner.java b/src/main/java/com/android/tools/r8/shaking/TreePruner.java
index af0efe5..e7a7fe5 100644
--- a/src/main/java/com/android/tools/r8/shaking/TreePruner.java
+++ b/src/main/java/com/android/tools/r8/shaking/TreePruner.java
@@ -289,7 +289,8 @@
         // Final classes cannot be abstract, so we have to keep the method in that case.
         // Also some other kinds of methods cannot be abstract, so keep them around.
         boolean allowAbstract =
-            clazz.accessFlags.isAbstract()
+            (!options.canHaveDalvikAbstractMethodOnNonAbstractClassVerificationBug()
+                    || clazz.accessFlags.isAbstract())
                 && !method.accessFlags.isFinal()
                 && !method.accessFlags.isNative()
                 && !method.accessFlags.isStrict()