diff options
| author | Raphael Moll <ralf@android.com> | 2012-06-07 10:39:25 -0700 |
|---|---|---|
| committer | android code review <noreply-gerritcodereview@google.com> | 2012-06-07 10:39:25 -0700 |
| commit | 1a928097b10b80d60858e53795ed018f47dc274f (patch) | |
| tree | 994db113b7f3a31046fe6d591eb4094365f3c435 /anttasks/src/com/android | |
| parent | a62be70fb36b9460c50c592e5a2e04a89ef1a212 (diff) | |
| parent | 6d544118e37fec4a0204783be59b506675c5f7ad (diff) | |
| download | sdk-1a928097b10b80d60858e53795ed018f47dc274f.zip sdk-1a928097b10b80d60858e53795ed018f47dc274f.tar.gz sdk-1a928097b10b80d60858e53795ed018f47dc274f.tar.bz2 | |
Merge "Manifest Merger: rework interface to collect errors."
Diffstat (limited to 'anttasks/src/com/android')
| -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, |