From e3ba7606e4f4f8b65c7bebc0b81ecd768bc14abb Mon Sep 17 00:00:00 2001
From: kmb <kmb@google.com>
Date: Thu, 22 Feb 2018 16:09:27 -0800
Subject: Actually retarget so-configured invocations in android desugaring
 RELNOTES: None.

PiperOrigin-RevId: 186690865
GitOrigin-RevId: c4f1df5b05e6b39c7c3d6538e702e4d7ff041cfb
Change-Id: Ib773bdc615639b82eab4943726dacf7004ce2983
---
 .../devtools/build/android/desugar/CoreLibraryInvocationRewriter.java    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/java/com/google/devtools/build/android/desugar/CoreLibraryInvocationRewriter.java b/java/com/google/devtools/build/android/desugar/CoreLibraryInvocationRewriter.java
index b4bc98b..fb62219 100644
--- a/java/com/google/devtools/build/android/desugar/CoreLibraryInvocationRewriter.java
+++ b/java/com/google/devtools/build/android/desugar/CoreLibraryInvocationRewriter.java
@@ -62,6 +62,7 @@ public class CoreLibraryInvocationRewriter extends ClassVisitor {
           desc = InterfaceDesugaring.companionDefaultMethodDescriptor(owner, desc);
           opcode = Opcodes.INVOKESTATIC;
         }
+        owner = newOwner;
         itf = false; // assuming a class
       } else if (coreInterface != null) {
         String coreInterfaceName = coreInterface.getName().replace('.', '/');
-- 
cgit v1.2.3