aboutsummaryrefslogtreecommitdiffstats
path: root/manifmerger
Commit message (Collapse)AuthorAgeFilesLines
* Change more SDK libs to prebuilts.Raphael Moll2013-02-061-2/+2
| | | | | | | | | | | Requires prebuilds/devtools.git I913a29e5f40db99871701461aad6fc38483015d2 To update the prebuilts, you need tools/base.git and the prebuilts/devtools/update_jars.sh script. This is supposed to be an intermediary step as we switch to tools/base. Change-Id: I3dcccfdd9dc243a22a5bfd9db6779d24285db1ac
* SDK: switch ddmlib to prebuilts/devtools/ddmlib/ddmlib.jarRaphael Moll2013-01-111-0/+3
| | | | | | This also removes the ddmlib-tests.jar module. Change-Id: Id44bcc4b91ee76e22a3a50c000cda1b1e7bb972e
* SDK: Remove sources for jobb & manifmerge. They are in tools/base now.Raphael Moll2013-01-0853-10546/+0
| | | | Change-Id: I1092079acad333deda47d4c8a092279879fadea6
* Change manifmerger & jobb to prebuilts.Raphael Moll2013-01-082-87/+18
| | | | | | | Contrary to the ill-advised change Ic57371dcea, this will just fail if the prebuilts are not present instead of trying to rebuilt them. Change-Id: I019b0369686ae6ed5a507d05209ea68919174f97
* Revert "SDK: Use prebuilds/devtools for manifmerger and jobb JAR libraries."Raphaël Moll2013-01-042-53/+89
| | | | | | This reverts commit 98df0cd625983742fc6dec224b0e2ce8fe6e74f6 Change-Id: I9ecadde8f4ac6208daaf15b3108e880a50fd39ce
* SDK: Use prebuilds/devtools for manifmerger and jobb JAR libraries.Raphael Moll2013-01-042-89/+53
| | | | Change-Id: Ic57371dcea36a94a1173012e7c252cd8cf317c88
* ManifMerger: merge application/meta-data.Raphael Moll2012-12-205-0/+356
| | | | | | | | | | This allows merging of API keys (e.g. backup key, maps key). Meta-data elements are merged if they are new or stricly equal. They conflict if their definition is different. Application can use tools:merge attributes to either block merging or ignore a different one. Change-Id: I967750e3d398c2193a62f4921faa61989f68716a
* ManifMerger: fix lack of comments.Raphael Moll2012-12-208-17/+80
| | | | | | | This fixes ea762f7cd0714854f72eb30d61fb0eced01dd628 and fixes a few incorrect comments in other test files. Change-Id: Ifd1dc33b5437489946a78fc3e61c079efa1280f9
* Refactor manifestmerger folder structure.Xavier Ducrohet2012-12-0651-48/+18
| | | | | | | | | | Move folders around to match default gradle/maven folder structure. The custom structure confused some IDEs when importing the project as a Gradle project. Change-Id: Iac1bcbeaaf2928681707f809c3718b87f7c5334a
* Update compiler flags.Tor Norbye2012-10-261-2/+2
| | | | | | | | | | Turns off the ability to use @SuppressWarnings with optional errors is available, but off by default (see Eclipse issue 392875). This turns that off, makes missing enums in switch statements a warning, and synchronizes the settings file to all projects (except tests.) Change-Id: Iad7060523b6ee2cbbca97e0a6ffedb264b185222
* Close file streams used by parsers (and add guava to sdkcommon)Tor Norbye2012-10-251-1/+4
| | | | | | Plus some nullness annotations. Change-Id: Ia75c6ffa5d6296c991fc86fec050f285b9143429
* Avoid inlining the package prefix when adding activitiesTor Norbye2012-10-255-0/+248
| | | | Change-Id: Ie4d5d0faa26d554e683d10392db306fc619914e6
* Update maven artifacts and add lint.Xavier Ducrohet2012-10-191-0/+1
| | | | | | | | | Updated the groupId of most artifacts to be more reflective of their sub-projects status in the SDK tools. Added lint artifacts. Change-Id: I900a165647a9b7d3c55b473f63c4ca4469762d7b
* Update the gradle build files.Xavier Ducrohet2012-10-021-6/+54
| | | | | | | add javadoc and source artifacts as well as POM information to upload to Maven Central. Change-Id: I51701f5a5db5b2ae41ecede115e2b36adf1fa05e
* Manifest Merger: override/remove attributes.Raphael Moll2012-10-0113-84/+1014
| | | | Change-Id: Ib9c08ae8eb39caa91c319534f0ab9a786d65b801
* ManifestMerger: ability to inject attributes.Raphael Moll2012-09-287-17/+308
| | | | Change-Id: Icbebe1dd3c8cf51f7d38b585a78264d01977e943
* Merge "Manifest Merger: children order should not impact merge."Raphael Moll2012-09-2610-270/+777
|\
| * Manifest Merger: children order should not impact merge.Raphael Moll2012-09-2410-270/+777
| | | | | | | | Change-Id: I5d4e0b5042c5e510ae1865d5d3ac759c89d00641
* | Remove null warningsTor Norbye2012-09-211-0/+2
|/ | | | | | | | | | | | | | | | | | | | | Eclipse's null analysis thinks that a couple of references (required to be non null) might be null. We can tell it we know better with an assertion. That's because its analysis doesn't go deep enough to for example understand this: Object x = null; boolean y = true; if (y) { x = "not null"; } if (y) { // Here we know x is not null, but Eclipse does not } Change-Id: If63db13feabf05832c5d9e488ace5c72224da554
* Manifest Merger: expand FQCNs to merge them properly.Raphael Moll2012-09-2029-139/+617
| | | | Change-Id: Ie02b67c644324505149aab2ef2accde326e682d3
* Add nullness annotations on overridden methodsTor Norbye2012-09-171-1/+1
| | | | | | Eclipse 4.x requires it. Change-Id: Iababca14d8edc8d62bce42f23ee26633dc49cf8c
* ManifestMerger: fix handling of codenames in min/targetSdkVersion.Raphael Moll2012-09-146-26/+133
| | | | | | | | | The change is that the manifest merger will only accept a codename if it's invoked in a context that can resolve that codename to an API level. This allows to produce an error on bogus codenames and to properly check that the API levels match appropriately. Change-Id: Ic70c0c3690b13d94dba81bb78cc09386016b2ef1
* Revert "Fix manifest merger for non-integer values"Raphael Moll2012-09-141-19/+25
| | | | | | This reverts commit 0ecd33255e76b00a45c79216c744cb624ba61756. The fix breaks unit tests and is in the way of the changes I want to do.
* Make some libraries be buildable with Gradle.Xavier Ducrohet2012-09-065-25/+54
| | | | | | They all output into out/host/repo Change-Id: I78a1a976f0a99860a66248492da7fd9c6593b1c2
* Unify all loggers in the sdk tools.Xavier Ducrohet2012-08-174-41/+16
| | | | | | | | | | 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
* More refactoring.Xavier Ducrohet2012-08-131-2/+2
| | | | | | | Move stuff out of sdklib into common and ide_common. Remove androidprefs and move the one class into common. Change-Id: I71d126a13cf2ba413692e29616f4968a37d7b33a
* Refactor common.jarXavier Ducrohet2012-08-071-1/+1
| | | | | | | | | | | | | | | Move resources and com.android.util.Pair into layoutlib_api where they belong since layoutlib depends on them and we need to control the API. Made a copy of Pair to stay in common.jar but moved it to com.android.utils.Pair (the one in com.android.util.Pair is marked as deprecated to prevent usage where applicable). Also moved XmlUtil and PositionXmlParser to com.android.utils to match Pair. Change-Id: I21d7057d3f2ce604f86a3bb1fa3c130948c93b89
* Fix manifest merger for non-integer valuesTor Norbye2012-07-301-25/+19
| | | | | | | | | | | | | | The minSdkVersion and targetSdkVersion attributes in a manifest file are allowed to contain non-numeric strings - they can contain codenames such as "JellyBean", when you're targeting a particular preview SDK. The manifest merger would fail to merge manifests where one or more of these attributes weren't numeric, which (for example) meant creating a new project and setting the minSdkVersion to a preview platform would create a non-merged manifest file. Change-Id: Idf0299f21beac003abc3bf55be657b9398c1e535
* 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
generated by cgit v1.1 at 2025-01-25 12:34:24 +0000