Cleanup previous layout generators.

Change-Id: Ib55038fa762561ad69c3936e5731f2a27998c87f

1 files changed, 3 insertions, 4 deletions

diff --git a/gradlePlugin/src/main/kotlin/plugin.kt b/gradlePlugin/src/main/kotlin/plugin.kt
index 51ff81e4..a4aba013 100644
--- a/gradlePlugin/src/main/kotlin/plugin.kt
+++ b/gradlePlugin/src/main/kotlin/plugin.kt
@@ -174,8 +174,9 @@ class DataBinderPlugin : Plugin<Project> {
         log("generated urls: ${urls} len: ${urls.size}")
         val classLoader = URLClassLoader(urls, androidClassLoader)
         log("created class loader")
-        parser.classAnalyzer = com.android.databinding.util.ClassAnalyzer(classLoader)
-        com.android.databinding2.ClassAnalyzer.setClassLoader(classLoader)
+        ClassAnalyzer.setClassLoader(classLoader)
+        parser.classAnalyzer = ClassAnalyzer.getInstance()
+
         project.task("compileGenerated", MethodClosure(this, "compileGenerated"))
     }
     fun compileGenerated(o : Any?) {
@@ -183,7 +184,6 @@ class DataBinderPlugin : Plugin<Project> {
         val fileManager = compiler.getStandardFileManager(null, null, null)
         val javaCompileTask = variantData.javaCompileTask
         val dexTask = variantData.dexTask
-        parser.analyzeClasses()
         parser.writeViewBinders(viewBinderSource)
         parser.writeDbrFile(viewBinderSource)
 
@@ -231,7 +231,6 @@ class DataBinderPlugin : Plugin<Project> {
     fun generateBrFile(o: Any?) {
         parser.processIfNecessary()
         log("generating BR ${o}")
-        parser.writeBrFile()
         parser.writeViewBinderInterfaces()
     }