send invocations to emulated interfaces through dispatch helper.

fix logic for implementing emulated interfaces.
RELNOTES: None.

PiperOrigin-RevId: 187520298

2 files changed, 13 insertions, 0 deletions

diff --git a/src/test/java/com/google/devtools/build/android/desugar/CoreLibrarySupportTest.java b/src/test/java/com/google/devtools/build/android/desugar/CoreLibrarySupportTest.java
index cc177482c9..90350ce753 100644
--- a/src/test/java/com/google/devtools/build/android/desugar/CoreLibrarySupportTest.java
+++ b/src/test/java/com/google/devtools/build/android/desugar/CoreLibrarySupportTest.java
@@ -34,6 +34,7 @@ public class CoreLibrarySupportTest {
         new CoreLibrarySupport(
             new CoreLibraryRewriter(""),
             null,
+            null,
             ImmutableList.of("java/time/"),
             ImmutableList.of(),
             ImmutableList.of());
@@ -51,6 +52,7 @@ public class CoreLibrarySupportTest {
         new CoreLibrarySupport(
             new CoreLibraryRewriter("__/"),
             null,
+            null,
             ImmutableList.of("java/time/"),
             ImmutableList.of(),
             ImmutableList.of());
@@ -67,6 +69,7 @@ public class CoreLibrarySupportTest {
         new CoreLibrarySupport(
             new CoreLibraryRewriter(""),
             null,
+            null,
             ImmutableList.of(),
             ImmutableList.of(),
             ImmutableList.of());
@@ -80,6 +83,7 @@ public class CoreLibrarySupportTest {
         new CoreLibrarySupport(
             new CoreLibraryRewriter("__/"),
             null,
+            null,
             ImmutableList.of(),
             ImmutableList.of(),
             ImmutableList.of());
@@ -93,6 +97,7 @@ public class CoreLibrarySupportTest {
         new CoreLibrarySupport(
             new CoreLibraryRewriter("__/"),
             null,
+            null,
             ImmutableList.of("java/util/Helper"),
             ImmutableList.of(),
             ImmutableList.of("java/util/Existing#match -> java/util/Helper"));
@@ -108,6 +113,7 @@ public class CoreLibrarySupportTest {
         new CoreLibrarySupport(
             new CoreLibraryRewriter(""),
             Thread.currentThread().getContextClassLoader(),
+            null,
             ImmutableList.of("java/util/concurrent/"),
             ImmutableList.of("java/util/Map"),
             ImmutableList.of());
@@ -126,6 +132,7 @@ public class CoreLibrarySupportTest {
         new CoreLibrarySupport(
             new CoreLibraryRewriter(""),
             Thread.currentThread().getContextClassLoader(),
+            null,
             ImmutableList.of(),
             ImmutableList.of("java/util/Collection"),
             ImmutableList.of());
@@ -161,6 +168,7 @@ public class CoreLibrarySupportTest {
         new CoreLibrarySupport(
             new CoreLibraryRewriter(""),
             Thread.currentThread().getContextClassLoader(),
+            null,
             ImmutableList.of(),
             ImmutableList.of("java/util/Collection"),
             ImmutableList.of());
@@ -188,6 +196,7 @@ public class CoreLibrarySupportTest {
         new CoreLibrarySupport(
             new CoreLibraryRewriter(""),
             Thread.currentThread().getContextClassLoader(),
+            null,
             ImmutableList.of(),
             ImmutableList.of("java/util/Map"),
             ImmutableList.of());
@@ -223,6 +232,7 @@ public class CoreLibrarySupportTest {
         new CoreLibrarySupport(
             new CoreLibraryRewriter(""),
             Thread.currentThread().getContextClassLoader(),
+            null,
             ImmutableList.of(),
             ImmutableList.of("java/util/Comparator"),
             ImmutableList.of());
@@ -246,6 +256,7 @@ public class CoreLibrarySupportTest {
         new CoreLibrarySupport(
             new CoreLibraryRewriter(""),
             Thread.currentThread().getContextClassLoader(),
+            null,
             ImmutableList.of("java/util/"),
             ImmutableList.of(),
             ImmutableList.of());
@@ -314,6 +325,7 @@ public class CoreLibrarySupportTest {
         new CoreLibrarySupport(
             new CoreLibraryRewriter(""),
             Thread.currentThread().getContextClassLoader(),
+            null,
             ImmutableList.of("java/util/concurrent/"),  // should return null for these
             ImmutableList.of("java/util/Map"),
             ImmutableList.of());
diff --git a/src/test/java/com/google/devtools/build/android/desugar/CorePackageRenamerTest.java b/src/test/java/com/google/devtools/build/android/desugar/CorePackageRenamerTest.java
index 0ff0f25ea3..d998aa27f8 100644
--- a/src/test/java/com/google/devtools/build/android/desugar/CorePackageRenamerTest.java
+++ b/src/test/java/com/google/devtools/build/android/desugar/CorePackageRenamerTest.java
@@ -35,6 +35,7 @@ public class CorePackageRenamerTest {
             new CoreLibrarySupport(
                 new CoreLibraryRewriter(""),
                 null,
+                null,
                 ImmutableList.of("java/time/"),
                 ImmutableList.of(),
                 ImmutableList.of("java/util/A#m->java/time/B")));