Make some libraries be buildable with Gradle.

They all output into out/host/repo

Change-Id: I78a1a976f0a99860a66248492da7fd9c6593b1c2

5 files changed, 54 insertions, 25 deletions

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());
         }