aboutsummaryrefslogtreecommitdiffstats
path: root/manifmerger
Commit message (Collapse)AuthorAgeFilesLines
* Add @NonNull annotations to overridden methodTor Norbye2012-06-071-14/+14
| | | | | | | | | | | | | Eclipse 4.2's new null analysis is useful, but (unfortunately) requires nullness annotations to be repeated on methods overriding or implementing interfaces where there are other nullness annotations. This changeset adds this for the manifest merger. (Eclipse Issue 381443 tracks a request for making the null analysis not require this and simply pick up annotations from the overridden or implemented method signature.) Change-Id: I063b7713c5dbca642a8afd3231bbe4002ec130e1
* Manifest Merger: rework interface to collect errors.Raphael Moll2012-06-0722-176/+547
| | | | Change-Id: Ib8add07a611d4d496004567fb23b8c5d38b6e487
* Fix warningsTor Norbye2012-06-013-80/+111
| | | | | | | | | | | | | | | | | First, update our various project-specific Eclipse compiler settings configuration files to include the new Eclipse 4 flags. Second, turn off the "Unchecked conversion from non-annotated type to @NonNull" warnings; there are hundreds or thousands of these, and there isn't much we can do about them when they're coming from platform and library APIs. Third, make the lint projects warning-clean again by addressing various warnings Eclipse found (such as some unclosed resources and some null handling issues; yesterday's null annotation fixes only addressed errors, not warnings.) Change-Id: If75f7401a1cbeef1bf58b47ccaa9ad17bede7f91
* Move XML code to the common libraryTor Norbye2012-05-202-5/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The ManifestMerger library needs to look up the prefix to use for the Android namespace, and the Document.lookupPrefix method is not implemented by the Eclipse DOM implementation (which throws an exception). However, we have an implementation of this in the ADT plugin. This changeset creates a new XmlUtils class in the common/ library (which is accessible by both ADT and the manifest merger, and the anttasks where the manifest merger is used), and moves the namespace prefix lookup code in there. It also moves the XML escape methods into that class. It also adds a new method to the ManifestMerger for merging directly from documents (rather than files), and makes sure that all the merging code goes via the prefix utility method rather than calling the document.lookupPrefix method. Finally, it moves the various string constants associated with XML namespaces into the single XmlUtils class, since these were spread across several different classes before (and many of them are needed in the XmlUtils class). The vast majority of the diffs in this changeset are related to simple import statement changes to reflect the new locations of these constants. Change-Id: Ib8f3d0e5c89e47e61ea509a23925af7b6580abee
* SDK: Enable tests for manifest-merger.Raphael Moll2012-01-122-1/+3
| | | | Change-Id: I48f74d5d3ff5237388915cb3823be5168903d417
* Manifest Merger tool.Raphael2012-01-1042-0/+7333
Change-Id: Iae9033f04654e03151c206b5dfb1fd8f47eea8f2