Make some libraries be buildable with Gradle.

They all output into out/host/repo

Change-Id: I78a1a976f0a99860a66248492da7fd9c6593b1c2

17 files changed, 211 insertions, 28 deletions

diff --git a/.gitignore b/.gitignore
index 019a6f1..0ab2568 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,8 @@ Thumbs.db
 *.class
 *.DS_Store
 testapps/testSensors/proguard.cfg
+.gradle
+/build/ivy.xml
 
 # Hide temporary files created by the build_server script
 eclipse/assemble.com.android.ide.eclipse.*.xml
diff --git a/build.gradle b/build.gradle
new file mode 100644
index 0000000..858b4d0
--- /dev/null
+++ b/build.gradle
@@ -0,0 +1,18 @@
+allprojects {
+    apply plugin: 'maven'
+
+    repositories {
+        mavenCentral()
+    }
+
+    version = '21.0-SNAPSHOT'
+
+	uploadArchives {
+	    repositories {
+	        mavenDeployer {
+	            repository(url: uri("$rootDir/../out/host/repo"))
+	        }
+	    }
+	}
+
+}
diff --git a/common/.gitignore b/common/.gitignore
index fe99505..4ff597c 100644
--- a/common/.gitignore
+++ b/common/.gitignore
@@ -1,2 +1,3 @@
 bin
+build
 
diff --git a/common/build.gradle b/common/build.gradle
new file mode 100644
index 0000000..ba02d70
--- /dev/null
+++ b/common/build.gradle
@@ -0,0 +1,29 @@
+apply plugin: 'java'
+
+dependencies {
+    compile 'com.google.guava:guava:11.0.2'
+
+    testCompile 'junit:junit:3.8.1'
+}
+
+group = 'com.android.tools'
+archivesBaseName = 'common'
+
+sourceSets {
+    main {
+        java {
+            srcDir 'src'
+        }
+        resources {
+            srcDir 'resources'
+        }
+    }
+    test {
+        java {
+            srcDir 'tests/src'
+        }
+        resources {
+            srcDir 'tests/resources'
+        }
+    }
+}
diff --git a/device_validator/.gitignore b/device_validator/.gitignore
new file mode 100644
index 0000000..42afabf
--- /dev/null
+++ b/device_validator/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/device_validator/dvlib/.gitignore b/device_validator/dvlib/.gitignore
index e660fd9..3558c56 100644
--- a/device_validator/dvlib/.gitignore
+++ b/device_validator/dvlib/.gitignore
@@ -1 +1,2 @@
 bin/
+build/
diff --git a/device_validator/dvlib/build.gradle b/device_validator/dvlib/build.gradle
new file mode 100644
index 0000000..36e0910
--- /dev/null
+++ b/device_validator/dvlib/build.gradle
@@ -0,0 +1,27 @@
+apply plugin: 'java'
+
+dependencies {
+    testCompile 'junit:junit:3.8.1'
+}
+
+group = 'com.android.tools'
+archivesBaseName = 'dvlib'
+
+sourceSets {
+    main {
+        java {
+            srcDir 'src'
+        }
+        resources {
+            srcDir 'src'
+        }
+    }
+    test {
+        java {
+            srcDir 'tests/src'
+        }
+        resources {
+            srcDir 'tests/src'
+        }
+   }
+}
diff --git a/layoutlib_api/.gitignore b/layoutlib_api/.gitignore
index fe99505..4ff597c 100644
--- a/layoutlib_api/.gitignore
+++ b/layoutlib_api/.gitignore
@@ -1,2 +1,3 @@
 bin
+build
 
diff --git a/layoutlib_api/build.gradle b/layoutlib_api/build.gradle
new file mode 100644
index 0000000..5534fdb
--- /dev/null
+++ b/layoutlib_api/build.gradle
@@ -0,0 +1,30 @@
+apply plugin: 'java'
+
+dependencies {
+    compile project(':common')
+    compile 'kxml2:kxml2:2.3.0'
+
+    testCompile 'junit:junit:3.8.1'
+}
+
+group = 'com.android.tools'
+archivesBaseName = 'layoutlib_api'
+
+sourceSets {
+    main {
+        java {
+            srcDir 'src'
+        }
+        resources {
+            srcDir 'src'
+        }
+    }
+    test {
+        java {
+            srcDir 'tests/src'
+        }
+        resources {
+            srcDir 'tests/src'
+        }
+    }
+}
diff --git a/manifmerger/.gitignore b/manifmerger/.gitignore
index ba077a4..4ff597c 100644
--- a/manifmerger/.gitignore
+++ b/manifmerger/.gitignore
@@ -1 +1,3 @@
 bin
+build
+
diff --git a/manifmerger/Android.mk b/manifmerger/Android.mk
index ce14ee6..093d5b3 100644
--- a/manifmerger/Android.mk
+++ b/manifmerger/Android.mk
@@ -1,7 +1,17 @@
 # Copyright 2011 The Android Open Source Project
 #
-MANIFMERGER_LOCAL_DIR := $(call my-dir)
-include $(MANIFMERGER_LOCAL_DIR)/src/Android.mk
-include $(MANIFMERGER_LOCAL_DIR)/etc/Android.mk
-include $(MANIFMERGER_LOCAL_DIR)/tests/Android.mk
+LOCAL_PATH := $(call my-dir)
+include $(CLEAR_VARS)
 
+LOCAL_JAVA_RESOURCE_DIRS :=
+
+LOCAL_SRC_FILES := $(call all-java-files-under,src)
+
+LOCAL_JAR_MANIFEST := etc/manifest.txt
+LOCAL_JAVA_LIBRARIES :=  \
+	common \
+	sdklib
+LOCAL_MODULE := manifmerger
+LOCAL_MODULE_TAGS := optional
+
+include $(BUILD_HOST_JAVA_LIBRARY)
diff --git a/manifmerger/build.gradle b/manifmerger/build.gradle
new file mode 100644
index 0000000..c5f2aeb
--- /dev/null
+++ b/manifmerger/build.gradle
@@ -0,0 +1,33 @@
+apply plugin: 'java'
+
+dependencies {
+    compile project(':common')
+    compile project(':sdkmanager:libs:sdklib')
+    compile 'kxml2:kxml2:2.3.0'
+
+// not sure why the following line works in sdklib but not here...
+//    testCompile project(':sdkmanager:libs:sdklib').sourceSets.test.output
+    testCompile 'junit:junit:3.8.1'
+}
+
+group = 'com.android.tools'
+archivesBaseName = 'manifest-merger'
+
+sourceSets {
+    main {
+        java {
+            srcDir 'src'
+        }
+        resources {
+            srcDir 'src'
+        }
+    }
+    test {
+        java {
+            srcDir 'tests/src'
+        }
+        resources {
+            srcDir 'tests/src'
+        }
+    }
+}
diff --git a/manifmerger/src/Android.mk b/manifmerger/src/Android.mk
deleted file mode 100644
index 5e533eb..0000000
--- a/manifmerger/src/Android.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 2011 The Android Open Source Project
-#
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_JAVA_RESOURCE_DIRS :=
-
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
-LOCAL_JAR_MANIFEST := ../etc/manifest.txt
-LOCAL_JAVA_LIBRARIES :=  \
-	common \
-	sdklib
-LOCAL_MODULE := manifmerger
-LOCAL_MODULE_TAGS := optional
-
-include $(BUILD_HOST_JAVA_LIBRARY)
diff --git a/manifmerger/src/com/android/manifmerger/XmlUtils.java b/manifmerger/src/com/android/manifmerger/XmlUtils.java
index f60d300..7e92d55 100755
--- a/manifmerger/src/com/android/manifmerger/XmlUtils.java
+++ b/manifmerger/src/com/android/manifmerger/XmlUtils.java
@@ -84,21 +84,21 @@ class XmlUtils {
                 @Override
                 public void warning(SAXParseException e) {
                     log.error(Severity.WARNING,
-                            new FileAndLine(xmlFile.getName(), 0),
+                            new FileAndLine(xmlFile.getAbsolutePath(), 0),
                             "Warning when parsing: %1$s",
                             e.toString());
                 }
                 @Override
                 public void fatalError(SAXParseException e) {
                     log.error(Severity.ERROR,
-                            new FileAndLine(xmlFile.getName(), 0),
+                            new FileAndLine(xmlFile.getAbsolutePath(), 0),
                             "Fatal error when parsing: %1$s",
                             xmlFile.getName(), e.toString());
                 }
                 @Override
                 public void error(SAXParseException e) {
                     log.error(Severity.ERROR,
-                            new FileAndLine(xmlFile.getName(), 0),
+                            new FileAndLine(xmlFile.getAbsolutePath(), 0),
                             "Error when parsing: %1$s",
                             e.toString());
                 }
@@ -112,12 +112,12 @@ class XmlUtils {
 
         } catch (FileNotFoundException e) {
             log.error(Severity.ERROR,
-                    new FileAndLine(xmlFile.getName(), 0),
+                    new FileAndLine(xmlFile.getAbsolutePath(), 0),
                     "XML file not found");
 
         } catch (Exception e) {
             log.error(Severity.ERROR,
-                    new FileAndLine(xmlFile.getName(), 0),
+                    new FileAndLine(xmlFile.getAbsolutePath(), 0),
                     "Failed to parse XML file: %1$s",
                     e.toString());
         }
diff --git a/sdkmanager/.gitignore b/sdkmanager/.gitignore
index 48f206a..7c578b4 100644
--- a/sdkmanager/.gitignore
+++ b/sdkmanager/.gitignore
@@ -1,4 +1,7 @@
-app/bin
-libs/sdklib/bin
-libs/sdkuilib/bin
+/app/bin
+/build
+/libs/build
+/libs/sdklib/bin
+/libs/sdklib/build
+/libs/sdkuilib/bin
 
diff --git a/sdkmanager/libs/sdklib/build.gradle b/sdkmanager/libs/sdklib/build.gradle
new file mode 100644
index 0000000..3e200ae
--- /dev/null
+++ b/sdkmanager/libs/sdklib/build.gradle
@@ -0,0 +1,36 @@
+apply plugin: 'java'
+
+dependencies {
+    compile project(':layoutlib_api')
+    compile project(':device_validator:dvlib')
+
+    compile 'org.apache.commons:commons-compress:1.0'
+    compile 'org.apache.httpcomponents:httpclient:4.1.1'
+    compile 'org.apache.httpcomponents:httpmime:4.1'
+    compile 'org.apache.commons:commons-compress:1.0'
+
+    testCompile project(':device_validator:dvlib').sourceSets.test.output
+    testCompile 'junit:junit:3.8.1'
+}
+
+group = 'com.android.tools'
+archivesBaseName = 'sdklib'
+
+sourceSets {
+    main {
+        java {
+            srcDir 'src'
+        }
+        resources {
+            srcDir 'src'
+        }
+    }
+    test {
+        java {
+            srcDir 'tests/src'
+        }
+        resources {
+            srcDir 'tests/src'
+        }
+    }
+}
diff --git a/settings.gradle b/settings.gradle
new file mode 100644
index 0000000..1a49ab9
--- /dev/null
+++ b/settings.gradle
@@ -0,0 +1,5 @@
+include 'common'
+include 'layoutlib_api'
+include 'device_validator:dvlib'
+include 'sdkmanager:libs:sdklib'
+include 'manifmerger'