commit ec9f889f4c118c229f8b74822bcd1a83149bc315
author Ian Zerny <zerny@google.com> Fri Feb 21 10:28:02 2020 +0100
committer Christoffer Quist Adamsen <christofferqa@google.com> Fri Feb 21 09:32:38 2020 +0000
tree 2fbe4d30892d8281922a1099118dd96f1122bad5
parent b89964f9ed0c42c92c18c16a77c3546780f98a6a

Don't double set library method override.

Change-Id: Idf37d352b1ab02d87fa2445d8b64889e4f68338f

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

diff --git a/src/main/java/com/android/tools/r8/shaking/Enqueuer.java b/src/main/java/com/android/tools/r8/shaking/Enqueuer.java
index 3d9c1c9..2b5cdde 100644
--- a/src/main/java/com/android/tools/r8/shaking/Enqueuer.java
+++ b/src/main/java/com/android/tools/r8/shaking/Enqueuer.java
@@ -1848,6 +1848,9 @@
   private void markOverridesAsLibraryMethodOverrides(
       DexProgramClass holder, DexEncodedMethod libraryMethodOverride) {
     assert holder.type == libraryMethodOverride.holder();
+    if (libraryMethodOverride.isLibraryMethodOverride().isTrue()) {
+      return;
+    }
     libraryMethodOverride.setLibraryMethodOverride(OptionalBool.TRUE);
     WorkList<DexType> worklist = WorkList.newIdentityWorkList();
     holder.forEachImmediateSupertype(worklist::addIfNotSeen);