commit be42b8094b6608e09c07418ca0d3b3e3319e84bd
author Raluca Sauciuc <ralucas@google.com> Thu Sep 13 20:14:41 2018 -0700
committer Vyacheslav Gerasimov <vyacheslav.gerasimov@jetbrains.com> Fri Sep 14 19:58:20 2018 +0300
tree d00beb8f043b9ceed094b3847fc76e82cef99e7f
parent 44ecfb2fb8630560aac78422e9f053c1cdfbc158

Expand the fix from commit 6c274cecff3 to cover AndroidX

Android Studio users who migrated to AndroidX are running into the
databinding deadlock again: https://issuetracker.google.com/111788726

compiler/frontend.java/src/org/jetbrains/kotlin/load/java/sam/SingleAbstractMethodUtils.java

diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/sam/SingleAbstractMethodUtils.java b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/sam/SingleAbstractMethodUtils.java
index 26d5bb8..99f4a71 100644
--- a/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/sam/SingleAbstractMethodUtils.java
+++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/sam/SingleAbstractMethodUtils.java
@@ -148,7 +148,7 @@
         // Otherwise android data binding can cause resolve re-entrance
         // For details see KT-18687, KT-16149
         // TODO: prevent resolve re-entrance on architecture level, or (alternatively) ask data binding owners not to do it
-        if (DescriptorUtilsKt.getFqNameSafe(klass).asString().equals("android.databinding.DataBindingComponent")) {
+        if (DescriptorUtilsKt.getFqNameSafe(klass).asString().endsWith(".databinding.DataBindingComponent")) {
             return null;
         }