From 6584643ee71e0c49ea330149a9552dca03f172cf Mon Sep 17 00:00:00 2001
From: Xavier Ducrohet <>
Date: Sat, 18 Apr 2009 16:00:05 -0700
Subject: [PATCH] AI 146552: am: CL 146247 am: CL 146229 Fix aidl error parsing
 (BUG #1789273)   Original author: xav   Merged from: //branches/cupcake/...  
 Original author: android-build

Automated import of CL 146552
---
 .../com/android/ide/eclipse/adt/build/PreCompilerBuilder.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/build/PreCompilerBuilder.java b/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/build/PreCompilerBuilder.java
index d4b525fcf..9257f2557 100644
--- a/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/build/PreCompilerBuilder.java
+++ b/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/build/PreCompilerBuilder.java
@@ -72,8 +72,10 @@ public class PreCompilerBuilder extends BaseBuilder {
     /**
      * Single line aidl error<br>
      * "&lt;path&gt;:&lt;line&gt;: &lt;error&gt;"
+     * or
+     * "&lt;path&gt;:&lt;line&gt; &lt;error&gt;"
      */
-    private static Pattern sAidlPattern1 = Pattern.compile("^(.+?):(\\d+):\\s(.+)$"); //$NON-NLS-1$
+    private static Pattern sAidlPattern1 = Pattern.compile("^(.+?):(\\d+):?\\s(.+)$"); //$NON-NLS-1$
 
     /**
      * Data to temporarly store aidl source file information