aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/tools/android/java/com/google/devtools/build/android/desugar/Desugar.java
diff options
context:
space:
mode:
authorGravatar cnsun <cnsun@google.com>2017-07-24 20:42:12 +0200
committerGravatar Jakob Buchgraber <buchgr@google.com>2017-07-24 21:04:55 +0200
commit849213b66c3fe3740c765c2635259d1912125b43 (patch)
treec7ebbc644ecb415a379bb1aaa0b7962b78c7c19a /src/tools/android/java/com/google/devtools/build/android/desugar/Desugar.java
parentc2188ebef3b1c0437059502779656e3eb4b56d93 (diff)
In UseBridge.class, check whether the owner of the method call instruction and
the owner of the method reference have assignable relation. If yes, use the bridge method. This CL addresses the integration problem between Desugar and the lambda factory of JDK 9. The change in JDK 9 is here,http://hg.openjdk.java.net/jdk9/dev/jdk/rev/a3b3c7b6464d. RELNOTES: None PiperOrigin-RevId: 162965244
Diffstat (limited to 'src/tools/android/java/com/google/devtools/build/android/desugar/Desugar.java')
-rw-r--r--src/tools/android/java/com/google/devtools/build/android/desugar/Desugar.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/tools/android/java/com/google/devtools/build/android/desugar/Desugar.java b/src/tools/android/java/com/google/devtools/build/android/desugar/Desugar.java
index cbc78340db..3feda5ab5b 100644
--- a/src/tools/android/java/com/google/devtools/build/android/desugar/Desugar.java
+++ b/src/tools/android/java/com/google/devtools/build/android/desugar/Desugar.java
@@ -505,6 +505,7 @@ class Desugar {
visitor,
lambdaClass,
bridgeMethodReader,
+ loader,
interfaceLambdaMethods,
allowDefaultMethods,
outputJava7);