diff options
| author | Xavier Ducrohet <xav@android.com> | 2012-08-16 19:28:20 -0700 |
|---|---|---|
| committer | Xavier Ducrohet <xav@android.com> | 2012-08-17 11:36:32 -0700 |
| commit | ae6a209f6f4030e1ebe20118f9455547e4cd50fc (patch) | |
| tree | f61ce892f88e3bee449eb6dddc8f820a4bfa6f1e /anttasks/src/com/android/ant/ManifestMergerTask.java | |
| parent | 8863aa8bdefdc769f483f72ab90b3d9d97aba212 (diff) | |
| download | sdk-ae6a209f6f4030e1ebe20118f9455547e4cd50fc.zip sdk-ae6a209f6f4030e1ebe20118f9455547e4cd50fc.tar.gz sdk-ae6a209f6f4030e1ebe20118f9455547e4cd50fc.tar.bz2 | |
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
Diffstat (limited to 'anttasks/src/com/android/ant/ManifestMergerTask.java')
| -rw-r--r-- | anttasks/src/com/android/ant/ManifestMergerTask.java | 5 |
1 files changed, 3 insertions, 2 deletions
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, |