diff options
| author | Xavier Ducrohet <xav@android.com> | 2012-09-24 16:00:40 -0700 |
|---|---|---|
| committer | Xavier Ducrohet <xav@android.com> | 2012-09-24 16:00:40 -0700 |
| commit | ed35eccae356e2101f7c7d96a4d684ca0532855e (patch) | |
| tree | 38e32570762f153904694b1fef129d7eef411650 /builder | |
| parent | 7eff27462d5989acf22839575ff0a8978e3369b5 (diff) | |
| download | build-ed35eccae356e2101f7c7d96a4d684ca0532855e.tar.gz | |
Update to the new manifest merger.
This version properly expands the class name of components
coming from libraries.
Change-Id: Ic579922b4e34cb12a7925c5818e67304606d657e
Diffstat (limited to 'builder')
| -rw-r--r-- | builder/prebuilts/manifmerger.jar | bin | 22896 -> 24390 bytes | |||
| -rw-r--r-- | builder/src/main/java/com/android/builder/AndroidBuilder.java | 4 |
2 files changed, 2 insertions, 2 deletions
diff --git a/builder/prebuilts/manifmerger.jar b/builder/prebuilts/manifmerger.jar Binary files differindex 74c366c..f3a42f2 100644 --- a/builder/prebuilts/manifmerger.jar +++ b/builder/prebuilts/manifmerger.jar diff --git a/builder/src/main/java/com/android/builder/AndroidBuilder.java b/builder/src/main/java/com/android/builder/AndroidBuilder.java index 8eaa18a..35b4557 100644 --- a/builder/src/main/java/com/android/builder/AndroidBuilder.java +++ b/builder/src/main/java/com/android/builder/AndroidBuilder.java @@ -354,7 +354,7 @@ public class AndroidBuilder { mainManifestOut.deleteOnExit(); } - ManifestMerger merger = new ManifestMerger(MergerLog.wrapSdkLog(mLogger)); + ManifestMerger merger = new ManifestMerger(MergerLog.wrapSdkLog(mLogger), null); if (merger.process( mainManifestOut, mainManifest, @@ -406,7 +406,7 @@ public class AndroidBuilder { } } - ManifestMerger merger = new ManifestMerger(MergerLog.wrapSdkLog(mLogger)); + ManifestMerger merger = new ManifestMerger(MergerLog.wrapSdkLog(mLogger), null); if (merger.process( outManifest, mainManifest, |