resolved conflicts for merge of 46ea63c7 to lmp-dev

Change-Id: Icd0fcdd90df854d5c74ace9732636a10e215074d
diff --git a/build.gradle b/build.gradle
index ee39208..4ecc4f3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,8 +1,19 @@
 apply plugin: 'java'
 
-// TODO(jboekeno): Create a host based build
+configurations {
+    // similar to 'default', export compile-time dependencies
+    host.extendsFrom(hostCompile)
+    target.extendsFrom(targetCompile)
+}
+
 sourceSets {
-    main {
+    host {
+        java {
+            srcDirs = ['src', 'cglib-and-asm/src']
+        }
+    }
+
+    target {
         java {
             srcDirs = ['src']
             exclude 'org/mockito/internal/creation/cglib/**',
@@ -21,14 +32,32 @@
     }
 }
 
-jar {
-    baseName 'mockito'
-    classifier 'api'
+dependencies {
+    targetCompile project(':hamcrest')
+    targetCompile project(':objenesis')
+    targetCompile project(path: ':junit', configuration: 'target')
+
+    hostCompile project(':hamcrest')
+    hostCompile project(':objenesis')
+    hostCompile project(path: ':junit', configuration: 'host')
+    hostCompile 'org.apache.ant:ant:1.8.0'
 }
 
-dependencies {
-    compile getAndroidPrebuilt('10')
-    compile project(':hamcrest')
-    compile project(':objenesis')
-    compile project(path: ':junit', configuration: 'target')
+task targetJar(type: Jar) {
+    from sourceSets.target.output
+    dependsOn targetClasses
+    baseName "mockito"
+    classifier "target"
+}
+
+task hostJar(type: Jar) {
+    from sourceSets.host.output
+    dependsOn hostClasses
+    baseName "mockito"
+    classifier "host"
+}
+
+artifacts {
+    host hostJar
+    target targetJar
 }