diff options
| author | Xavier Ducrohet <xav@android.com> | 2012-04-23 11:21:03 -0700 |
|---|---|---|
| committer | Xavier Ducrohet <xav@android.com> | 2012-04-23 13:37:02 -0700 |
| commit | 3b7b3c0cc33462c7eebae6fbd7f5e994625b9011 (patch) | |
| tree | 7d3b837b87e5dc5b5062075cb55c4622a6ac7e79 /anttasks/src/com/android/ant/ManifestMergerTask.java | |
| parent | dedd7eacb4e82ff09cc00516ad4ab5edd9f9bab5 (diff) | |
| download | sdk-3b7b3c0cc33462c7eebae6fbd7f5e994625b9011.zip sdk-3b7b3c0cc33462c7eebae6fbd7f5e994625b9011.tar.gz sdk-3b7b3c0cc33462c7eebae6fbd7f5e994625b9011.tar.bz2 | |
Minor fixes in Ant.
Moved the definition of the custom Ant tasks
into a properties file put in the jar files.
Change-Id: I33b49c9f8f51ffa4f8a8dcaefccc6e0d874a6a9d
Diffstat (limited to 'anttasks/src/com/android/ant/ManifestMergerTask.java')
| -rw-r--r-- | anttasks/src/com/android/ant/ManifestMergerTask.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/anttasks/src/com/android/ant/ManifestMergerTask.java b/anttasks/src/com/android/ant/ManifestMergerTask.java index 1b145b0..ead564c 100644 --- a/anttasks/src/com/android/ant/ManifestMergerTask.java +++ b/anttasks/src/com/android/ant/ManifestMergerTask.java @@ -112,7 +112,7 @@ public class ManifestMergerTask extends SingleDependencyTask { if (mDisable) { System.out.println("Manifest merger disabled. Using project manifest only."); } else { - System.out.println("No libraries. Using app manifest only."); + System.out.println("No libraries. Using project manifest only."); } // no merge (disabled or nothing to merge)? do a simple copy. try { |