Merge "Fix gradle build of sdk libs by adding testutils."

5 files changed, 29 insertions, 2 deletions

diff --git a/build.gradle b/build.gradle
index d529d1b..da559b5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -45,5 +45,4 @@ subprojects {
             }
         }
     }
-
 }
diff --git a/ddms/libs/ddmlib/build.gradle b/ddms/libs/ddmlib/build.gradle
index 7e635fe..ab07f70 100644
--- a/ddms/libs/ddmlib/build.gradle
+++ b/ddms/libs/ddmlib/build.gradle
@@ -1,4 +1,6 @@
 dependencies {
+    compile 'kxml2:kxml2:2.3.0'
+
     testCompile 'org.easymock:easymock:3.1'
     testCompile 'junit:junit:3.8.1'
 }
diff --git a/lint/libs/lint_checks/build.gradle b/lint/libs/lint_checks/build.gradle
index 53a3cf8..3218042 100644
--- a/lint/libs/lint_checks/build.gradle
+++ b/lint/libs/lint_checks/build.gradle
@@ -5,6 +5,7 @@ dependencies {
     testCompile 'org.easymock:easymock:3.1'
     testCompile 'junit:junit:3.8.1'
     testCompile project(':lint')
+    testCompile project(':testutils')
 }
 
 def getVersion() {
diff --git a/settings.gradle b/settings.gradle
index f10b6a4..5f8a301 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -7,10 +7,12 @@ include 'manifmerger'
 include 'lint_api'
 include 'lint_checks'
 include 'lint'
+include 'testutils'
 
 project(':dvlib').projectDir = new File('device_validator/dvlib')
 project(':sdklib').projectDir = new File('sdkmanager/libs/sdklib')
 project(':ddmlib').projectDir = new File('ddms/libs/ddmlib')
 project(':lint_api').projectDir = new File('lint/libs/lint_api')
 project(':lint_checks').projectDir = new File('lint/libs/lint_checks')
-project(':lint').projectDir = new File('lint/cli')
\ No newline at end of file
+project(':lint').projectDir = new File('lint/cli')
+project(':testutils').projectDir = new File('testutils')
\ No newline at end of file
diff --git a/testutils/build.gradle b/testutils/build.gradle
new file mode 100644
index 0000000..8ffc129
--- /dev/null
+++ b/testutils/build.gradle
@@ -0,0 +1,23 @@
+dependencies {
+    compile project(':common')
+    compile 'junit:junit:3.8.1'
+}
+
+sourceSets {
+    main {
+        java {
+            srcDir 'src'
+        }
+        resources {
+            srcDir 'resources'
+        }
+    }
+    test {
+        java {
+            srcDir 'tests/src'
+        }
+        resources {
+            srcDir 'tests/resources'
+        }
+    }
+}