diff options
| author | Raphael Moll <ralf@android.com> | 2012-06-05 22:45:46 -0700 |
|---|---|---|
| committer | Raphael Moll <ralf@android.com> | 2012-06-07 10:37:57 -0700 |
| commit | 6d544118e37fec4a0204783be59b506675c5f7ad (patch) | |
| tree | ba635bef15ce3bf257c0d8f1b26bcf34dfd78f03 /anttasks/src | |
| parent | ff254496adfac17d2b11f2e6db6fc8c6e0d7fb79 (diff) | |
| download | sdk-6d544118e37fec4a0204783be59b506675c5f7ad.zip sdk-6d544118e37fec4a0204783be59b506675c5f7ad.tar.gz sdk-6d544118e37fec4a0204783be59b506675c5f7ad.tar.bz2 | |
Manifest Merger: rework interface to collect errors.
Change-Id: Ib8add07a611d4d496004567fb23b8c5d38b6e487
Diffstat (limited to 'anttasks/src')
| -rw-r--r-- | anttasks/src/com/android/ant/ManifestMergerTask.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/anttasks/src/com/android/ant/ManifestMergerTask.java b/anttasks/src/com/android/ant/ManifestMergerTask.java index 5921939..ef0dfce 100644 --- a/anttasks/src/com/android/ant/ManifestMergerTask.java +++ b/anttasks/src/com/android/ant/ManifestMergerTask.java @@ -17,6 +17,7 @@ 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; @@ -123,7 +124,7 @@ public class ManifestMergerTask extends SingleDependencyTask { } else { System.out.println(String.format("Merging manifests from project and %d libraries.", libraries.size())); - ManifestMerger merger = new ManifestMerger(new StdSdkLog()); + ManifestMerger merger = new ManifestMerger(MergerLog.wrapSdkLog(new StdSdkLog())); if (merger.process( new File(mOutManifest), appManifestFile, |