aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTor Norbye <tnorbye@google.com>2012-09-04 07:26:05 -0700
committerTor Norbye <tnorbye@google.com>2012-09-04 07:26:05 -0700
commit6d266a1bf5992d27fff4400c5d2bd30681c65c3d (patch)
treed550e92718d9aa0fe3555d598d737c4cef7e348f
parentb783ba0d7b4bc773abc78a9ea1cc3d519aa39cbd (diff)
downloadsdk-6d266a1bf5992d27fff4400c5d2bd30681c65c3d.zip
sdk-6d266a1bf5992d27fff4400c5d2bd30681c65c3d.tar.gz
sdk-6d266a1bf5992d27fff4400c5d2bd30681c65c3d.tar.bz2
36987: TaskHelper can't parse the tools revision number "21 rc3"
Change-Id: I4286930a2d36d21d9eb60a1c96c70276b77b9d4a
-rw-r--r--anttasks/src/com/android/ant/TaskHelper.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/anttasks/src/com/android/ant/TaskHelper.java b/anttasks/src/com/android/ant/TaskHelper.java
index 24aeb8b..fe154cf 100644
--- a/anttasks/src/com/android/ant/TaskHelper.java
+++ b/anttasks/src/com/android/ant/TaskHelper.java
@@ -93,6 +93,11 @@ final class TaskHelper {
String value = p.getProperty("Pkg.Revision"); //$NON-NLS-1$
if (value != null) {
+ value = value.trim();
+ int space = value.indexOf(' ');
+ if (space != -1) {
+ value = value.substring(0, space);
+ }
return new DeweyDecimal(value);
}
} catch (FileNotFoundException e) {