commit a1aa63fc9cfb842cbda32bc5bc7747575d22f4f0
author clementbera <clementbera@google.com> Wed Jul 17 16:26:41 2019 +0200
committer Clément Béra <clementbera@google.com> Thu Jul 18 11:37:22 2019 +0000
tree 9cbc8cea54505fbd38ec50dc211232264593dba2
parent e33c0742bc7433b5b9a2fc3e6cce4f0ae1ee2ca0

ConcurrentNavigableMap no longer emulated

Bug: 134732760
Change-Id: I187c28fd1e609ff77a5852d06c8ff2e8a49b8efb

src/main/java/com/android/tools/r8/D8Command.java

diff --git a/src/main/java/com/android/tools/r8/D8Command.java b/src/main/java/com/android/tools/r8/D8Command.java
index 469ea8d..f14d072 100644
--- a/src/main/java/com/android/tools/r8/D8Command.java
+++ b/src/main/java/com/android/tools/r8/D8Command.java
@@ -356,9 +356,6 @@
         // with default methods. Emulated interfaces have their
         // companion class moved to j$ and have a dispatch class.
         // Bazel instead analyzes the class hierarchy.
-        .put(
-            "java.util.concurrent.ConcurrentNavigableMap",
-            "j$.util.concurrent.ConcurrentNavigableMap")
         .put("java.util.List", "j$.util.List")
         .put("java.util.SortedSet", "j$.util.SortedSet")
         .put("java.util.Set", "j$.util.Set")

src/main/java/com/android/tools/r8/L8Command.java

diff --git a/src/main/java/com/android/tools/r8/L8Command.java b/src/main/java/com/android/tools/r8/L8Command.java
index 7a79f59..9685747 100644
--- a/src/main/java/com/android/tools/r8/L8Command.java
+++ b/src/main/java/com/android/tools/r8/L8Command.java
@@ -273,9 +273,6 @@
         // with default methods. Emulated interfaces have their
         // companion class moved to j$ and have a dispatch class.
         // Bazel instead analyzes the class hierarchy.
-        .put(
-            "java.util.concurrent.ConcurrentNavigableMap",
-            "j$.util.concurrent.ConcurrentNavigableMap")
         .put("java.util.List", "j$.util.List")
         .put("java.util.SortedSet", "j$.util.SortedSet")
         .put("java.util.Set", "j$.util.Set")

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

diff --git a/src/main/java/com/android/tools/r8/ir/desugar/InterfaceMethodRewriter.java b/src/main/java/com/android/tools/r8/ir/desugar/InterfaceMethodRewriter.java
index f1072b0..9fd04ad 100644
--- a/src/main/java/com/android/tools/r8/ir/desugar/InterfaceMethodRewriter.java
+++ b/src/main/java/com/android/tools/r8/ir/desugar/InterfaceMethodRewriter.java
@@ -697,6 +697,7 @@
         if (newType != null
             && clazz.type.rewritingPrefixIn(appView.options().rewritePrefix) == null) {
           // We do not rewrite if it is already going to be rewritten using the a rewritingPrefix.
+          addRewritePrefix(clazz.type, newType.toString());
           renameEmulatedInterfaces(clazz, newType);
         }
       }