commit 6584643ee71e0c49ea330149a9552dca03f172cf
author Xavier Ducrohet Sat Apr 18 16:00:05 2009 -0700
committer The Android Open Source Project <initial-contribution@android.com> Sat Apr 18 16:00:05 2009 -0700
tree 91f93db44d4f723cb03d7b3a85d0da4c15f33210
parent fd46c2cf5ad972a243f4d8f7df4b3fe05e454a2f

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

tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/build/PreCompilerBuilder.java

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 d4b525f..9257f25 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 @@
     /**
      * 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