aboutsummaryrefslogtreecommitdiffstats
path: root/anttasks/src/com/android/ant/ManifestMergerTask.java
Commit message (Collapse)AuthorAgeFilesLines
* SDK: Delete projects moved to tools/base or tools/swt.Raphael Moll2013-03-131-169/+0
| | | | Change-Id: Iba15f82cb00d19217382c78d8ff37dda1e97ea59
* ManifestMerger: ability to inject attributes.Raphael Moll2012-09-281-1/+2
| | | | Change-Id: Icbebe1dd3c8cf51f7d38b585a78264d01977e943
* Add nullness annotations on overridden methodsTor Norbye2012-09-171-1/+2
| | | | | | Eclipse 4.x requires it. Change-Id: Iababca14d8edc8d62bce42f23ee26633dc49cf8c
* ManifestMerger: fix handling of codenames in min/targetSdkVersion.Raphael Moll2012-09-141-2/+24
| | | | | | | | | 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
* Unify all loggers in the sdk tools.Xavier Ducrohet2012-08-171-2/+3
| | | | | | | | | | 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
* Manifest Merger: rework interface to collect errors.Raphael Moll2012-06-071-1/+2
| | | | Change-Id: Ib8add07a611d4d496004567fb23b8c5d38b6e487
* Fix Ant build.Xavier Ducrohet2012-04-231-1/+1
| | | | Change-Id: I0c7d996f9ea3d27ef2cb8daa671c6284be588d54
* Revert the disable flag of the manifest merger to be enable instead.Xavier Ducrohet2012-04-231-7/+7
| | | | Change-Id: I4f89b469e06f741b95b92d7a4826f979c64dab1b
* Minor fixes in Ant.Xavier Ducrohet2012-04-231-1/+1
| | | | | | | Moved the definition of the custom Ant tasks into a properties file put in the jar files. Change-Id: I33b49c9f8f51ffa4f8a8dcaefccc6e0d874a6a9d
* Manifest merger in Ant build.Xavier Ducrohet2012-04-201-0/+143
This merges the manifest of the libraries into the application's manifest. Change-Id: I425e7b75f71d3f50c6422cdb62bb5ec6811ce99d