commit d069fc186c8d1a0f76fa3673181332ead98d831d
author Christoffer Quist Adamsen <christofferqa@google.com> Wed Aug 04 10:37:32 2021 +0200
committer Christoffer Quist Adamsen <christofferqa@google.com> Wed Aug 04 10:37:32 2021 +0200
tree 7855681ab2ac1140251a1bb992d19e46faeac105
parent 3329374bcc836bbf85a80c2adb85dbd0992a9571

Only set library-override information for virtual methods

Change-Id: I321821fb68281c9e7e9b054632275b7a2269e475

src/main/java/com/android/tools/r8/graph/DexEncodedMethod.java

diff --git a/src/main/java/com/android/tools/r8/graph/DexEncodedMethod.java b/src/main/java/com/android/tools/r8/graph/DexEncodedMethod.java
index 0725144..634f2bb 100644
--- a/src/main/java/com/android/tools/r8/graph/DexEncodedMethod.java
+++ b/src/main/java/com/android/tools/r8/graph/DexEncodedMethod.java
@@ -942,7 +942,9 @@
     assert !accessFlags.isStatic();
     return builder(this)
         .modifyAccessFlags(MethodAccessFlags::setAbstract)
-        .setIsLibraryMethodOverrideIfKnown(isLibraryMethodOverride())
+        .setIsLibraryMethodOverrideIf(
+            isNonPrivateVirtualMethod() && !isLibraryMethodOverride().isUnknown(),
+            isLibraryMethodOverride())
         .unsetCode()
         .addBuildConsumer(
             method -> OptimizationFeedbackSimple.getInstance().unsetBridgeInfo(method))