Unify all loggers in the sdk tools.

Removed ILogger from ide_common
Removed ISdkLog (and implementations) from sdklib

Moved all existing code to com.android.utils.ILogger
which is located in common.

Change-Id: Icd674d4b8d10f6ae8b60a83acb43cc53c7a52137

3 files changed, 19 insertions, 8 deletions

diff --git a/anttasks/src/com/android/ant/GetTargetTask.java b/anttasks/src/com/android/ant/GetTargetTask.java
index ef65e02..426b01b 100644
--- a/anttasks/src/com/android/ant/GetTargetTask.java
+++ b/anttasks/src/com/android/ant/GetTargetTask.java
@@ -20,9 +20,9 @@ import com.android.SdkConstants;
 import com.android.sdklib.AndroidVersion;
 import com.android.sdklib.IAndroidTarget;
 import com.android.sdklib.IAndroidTarget.IOptionalLibrary;
-import com.android.sdklib.ISdkLog;
 import com.android.sdklib.SdkManager;
 import com.android.sdklib.internal.project.ProjectProperties;
+import com.android.utils.ILogger;
 import com.android.xml.AndroidManifest;
 import com.android.xml.AndroidXPathFactory;
 
@@ -117,7 +117,7 @@ public class GetTargetTask extends Task {
 
         // load up the sdk targets.
         final ArrayList<String> messages = new ArrayList<String>();
-        SdkManager manager = SdkManager.createManager(sdkDir.getPath(), new ISdkLog() {
+        SdkManager manager = SdkManager.createManager(sdkDir.getPath(), new ILogger() {
             @Override
             public void error(Throwable t, String errorFormat, Object... args) {
                 if (errorFormat != null) {
@@ -129,11 +129,16 @@ public class GetTargetTask extends Task {
             }
 
             @Override
-            public void printf(String msgFormat, Object... args) {
+            public void info(String msgFormat, Object... args) {
                 messages.add(String.format(msgFormat, args));
             }
 
             @Override
+            public void verbose(String msgFormat, Object... args) {
+                info(msgFormat, args);
+            }
+
+            @Override
             public void warning(String warningFormat, Object... args) {
                 messages.add(String.format("Warning: " + warningFormat, args));
             }
diff --git a/anttasks/src/com/android/ant/GetUiTargetTask.java b/anttasks/src/com/android/ant/GetUiTargetTask.java
index 4756b49..5c34fa1 100644
--- a/anttasks/src/com/android/ant/GetUiTargetTask.java
+++ b/anttasks/src/com/android/ant/GetUiTargetTask.java
@@ -18,9 +18,9 @@ package com.android.ant;
 
 import com.android.sdklib.IAndroidTarget;
 import com.android.sdklib.IAndroidTarget.IOptionalLibrary;
-import com.android.sdklib.ISdkLog;
 import com.android.sdklib.SdkManager;
 import com.android.sdklib.internal.project.ProjectProperties;
+import com.android.utils.ILogger;
 
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
@@ -66,7 +66,7 @@ public class GetUiTargetTask extends Task {
 
         // load up the sdk targets.
         final ArrayList<String> messages = new ArrayList<String>();
-        SdkManager manager = SdkManager.createManager(sdkDir.getPath(), new ISdkLog() {
+        SdkManager manager = SdkManager.createManager(sdkDir.getPath(), new ILogger() {
             @Override
             public void error(Throwable t, String errorFormat, Object... args) {
                 if (errorFormat != null) {
@@ -78,11 +78,16 @@ public class GetUiTargetTask extends Task {
             }
 
             @Override
-            public void printf(String msgFormat, Object... args) {
+            public void info(String msgFormat, Object... args) {
                 messages.add(String.format(msgFormat, args));
             }
 
             @Override
+            public void verbose(String msgFormat, Object... args) {
+                info(msgFormat, args);
+            }
+
+            @Override
             public void warning(String warningFormat, Object... args) {
                 messages.add(String.format("Warning: " + warningFormat, args));
             }
diff --git a/anttasks/src/com/android/ant/ManifestMergerTask.java b/anttasks/src/com/android/ant/ManifestMergerTask.java
index ef0dfce..597e1e9 100644
--- a/anttasks/src/com/android/ant/ManifestMergerTask.java
+++ b/anttasks/src/com/android/ant/ManifestMergerTask.java
@@ -18,8 +18,8 @@ package com.android.ant;
 
 import com.android.manifmerger.ManifestMerger;
 import com.android.manifmerger.MergerLog;
-import com.android.sdklib.StdSdkLog;
 import com.android.sdklib.io.FileOp;
+import com.android.utils.StdLogger;
 
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.types.Path;
@@ -124,7 +124,8 @@ public class ManifestMergerTask extends SingleDependencyTask {
         } else {
             System.out.println(String.format("Merging manifests from project and %d libraries.",
                     libraries.size()));
-            ManifestMerger merger = new ManifestMerger(MergerLog.wrapSdkLog(new StdSdkLog()));
+            ManifestMerger merger = new ManifestMerger(MergerLog.wrapSdkLog(
+                    new StdLogger(StdLogger.Level.VERBOSE)));
             if (merger.process(
                     new File(mOutManifest),
                     appManifestFile,