Merge branch 'readonly-p4-master'

2009-04-18 16:01:21 -07:00
parent 700c52200f 6584643ee7
commit 757a80d596
1 changed files with 3 additions and 1 deletions
--- 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