6d544118e37fec4a0204783be59b506675c5f7ad - platform/sdk

commit	6d544118e37fec4a0204783be59b506675c5f7ad	[log] [tgz]
author	Raphael Moll <ralf@android.com>	Tue Jun 05 22:45:46 2012 -0700
committer	Raphael Moll <ralf@android.com>	Thu Jun 07 10:37:57 2012 -0700
tree	ba635bef15ce3bf257c0d8f1b26bcf34dfd78f03
parent	ff254496adfac17d2b11f2e6db6fc8c6e0d7fb79 [diff]

Manifest Merger: rework interface to collect errors.

Change-Id: Ib8add07a611d4d496004567fb23b8c5d38b6e487

anttasks/src/com/android/ant/ManifestMergerTask.java[diff]
manifmerger/src/com/android/manifmerger/IMergerLog.java[Added - diff]
manifmerger/src/com/android/manifmerger/Main.java[diff]
manifmerger/src/com/android/manifmerger/ManifestMerger.java[diff]
manifmerger/src/com/android/manifmerger/MergerLog.java[Added - diff]
manifmerger/src/com/android/manifmerger/XmlUtils.java[diff]
manifmerger/tests/src/com/android/manifmerger/ManifestMergerTestCase.java[diff]
manifmerger/tests/src/com/android/manifmerger/data/10_activity_merge.xml[diff]
manifmerger/tests/src/com/android/manifmerger/data/11_activity_dup.xml[diff]
manifmerger/tests/src/com/android/manifmerger/data/12_alias_dup.xml[diff]
manifmerger/tests/src/com/android/manifmerger/data/13_service_dup.xml[diff]
manifmerger/tests/src/com/android/manifmerger/data/14_receiver_dup.xml[diff]
manifmerger/tests/src/com/android/manifmerger/data/15_provider_dup.xml[diff]
manifmerger/tests/src/com/android/manifmerger/data/21_uses_lib_errors.xml[diff]
manifmerger/tests/src/com/android/manifmerger/data/26_permission_dup.xml[diff]
manifmerger/tests/src/com/android/manifmerger/data/33_uses_sdk_minsdk_conflict.xml[diff]
manifmerger/tests/src/com/android/manifmerger/data/36_uses_sdk_targetsdk_warning.xml[diff]
manifmerger/tests/src/com/android/manifmerger/data/41_uses_feat_errors.xml[diff]
manifmerger/tests/src/com/android/manifmerger/data/47_uses_feat_gles_conflict.xml[diff]
manifmerger/tests/src/com/android/manifmerger/data/50_uses_conf_warning.xml[diff]
manifmerger/tests/src/com/android/manifmerger/data/52_support_screens_warning.xml[diff]
manifmerger/tests/src/com/android/manifmerger/data/54_compat_screens_warning.xml[diff]
manifmerger/tests/src/com/android/manifmerger/data/56_support_gltext_warning.xml[diff]

23 files changed