From 607fb140679970b683102200aecbc06880a529e7 Mon Sep 17 00:00:00 2001
From: Yigit Boyar <yboyar@google.com>
Date: Tue, 27 Jan 2015 14:30:59 -0800
Subject: [PATCH] fix genereated code folder

Change-Id: Ic7efa25a60efac547bf7531b4b5aed8634babb95
---
 .../gradlePlugin/src/main/kotlin/plugin.kt        | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/tools/data-binding/gradlePlugin/src/main/kotlin/plugin.kt b/tools/data-binding/gradlePlugin/src/main/kotlin/plugin.kt
index 46f23e7514736..3725616d99faa 100644
--- a/tools/data-binding/gradlePlugin/src/main/kotlin/plugin.kt
+++ b/tools/data-binding/gradlePlugin/src/main/kotlin/plugin.kt
@@ -57,11 +57,11 @@ class DataBinderPlugin : Plugin<Project> {
 
     var variantData : ApplicationVariantData by Delegates.notNull()
 
-    val testOut by Delegates.lazy {
-        File("app/build/databinder")
-    }
     var viewBinderSource : File by Delegates.notNull()
-    val viewBinderCompileOutput by Delegates.lazy { File(testOut, "out") }
+    val viewBinderSourceRoot by Delegates.lazy {
+        File(project.getBuildDir(), "databinder")
+    }
+    val viewBinderCompileOutput by Delegates.lazy { File(viewBinderSourceRoot, "out") }
 
     override fun apply(project: Project?) {
         if (project == null) return
@@ -108,6 +108,7 @@ class DataBinderPlugin : Plugin<Project> {
         val ss = p.getExtensions().getByName("android") as AppExtension
         androidJar = File(ss.getSdkDirectory().getAbsolutePath() + "/platforms/${ss.getCompileSdkVersion()}/android.jar")
         log("creating parser!")
+        log("project build dir:${p.getBuildDir()}")
         val clazz = javaClass<ApplicationVariantImpl>()
         val field = clazz.getDeclaredField("variantData")
         field.setAccessible(true)
@@ -129,13 +130,15 @@ class DataBinderPlugin : Plugin<Project> {
         val codeGenTargetFolder = variantData.generateRClassTask.getSourceOutputDir()
         val resGenTargetFolder = variantData.generateRClassTask.getResDir()
         variantData.addJavaSourceFoldersToModel(codeGenTargetFolder)
+        variantData.addJavaSourceFoldersToModel(viewBinderSourceRoot)
+
         val jCompileTask = variantData.javaCompileTask
         val dexTask = variantData.dexTask
         val options = jCompileTask.getOptions()
         log("compile options: ${options.optionMap()}")
-        viewBinderSource = File(testOut.getAbsolutePath() + "/src/" + packageName.split("\\.").join("/"))
+        viewBinderSource = File(viewBinderSourceRoot.getAbsolutePath() + "/src/" + packageName.split("\\.").join("/"))
         viewBinderSource.mkdirs()
-        variantData.registerJavaGeneratingTask(project.task("dataBinderDummySourceGenTask", MethodClosure(this,"dummySourceGenTask" )), File(testOut.getAbsolutePath() + "/src/"))
+        variantData.registerJavaGeneratingTask(project.task("dataBinderDummySourceGenTask", MethodClosure(this,"dummySourceGenTask" )), File(viewBinderSourceRoot.getAbsolutePath() + "/src/"))
         viewBinderCompileOutput.mkdirs()
         log("view binder source will be ${viewBinderSource}")
         log("adding out dir to input files ${viewBinderCompileOutput}")