commit 54f59ac04f3e21d5aecdd46bb1e7f4577924ab92
author Alon Albert <aalbert@google.com> Thu Jun 13 13:27:15 2013 -0700
committer Alon Albert <aalbert@google.com> Thu Jun 13 13:29:58 2013 -0700
tree 45d53aadfe83da2141878a46a44ed22795dd7294
parent 3082b4a5fc45bc123067c9a984f90b7706704c59

Update Retrace Default Regex to Latest Version

So it supports Android Bugreport Syntax

Change-Id: I09713b53364a2e4cda44ee67325f183a54075433

lib/retrace.jar

diff --git a/lib/retrace.jar b/lib/retrace.jar
index 8e42e5a..ea5998b 100644
--- a/lib/retrace.jar
+++ b/lib/retrace.jar
Binary files differ

src/proguard/retrace/ReTrace.java

diff --git a/src/proguard/retrace/ReTrace.java b/src/proguard/retrace/ReTrace.java
index 97ab27b..bf6a145 100644
--- a/src/proguard/retrace/ReTrace.java
+++ b/src/proguard/retrace/ReTrace.java
@@ -40,8 +40,11 @@
     private static final String REGEX_OPTION   = "-regex";
     private static final String VERBOSE_OPTION = "-verbose";
 
-
-    public static final String STACK_TRACE_EXPRESSION = "(?:\\s*%c:.*)|(?:\\s*at\\s+%c.%m\\s*\\(.*?(?::%l)?\\)\\s*)";
+    // BEGIN android-changed
+    // Use regex from latest version (4.9) because it is
+    // able to handle Android Bugreport format
+    public static final String STACK_TRACE_EXPRESSION = "(?:.*?\\bat\\s+%c.%m\\s*\\(.*?(?::%l)?\\)\\s*)|(?:(?:.*?[:\"]\\s+)?%c(?::.*)?)";
+    // END android-changed
 
     private static final String REGEX_CLASS       = "\\b(?:[A-Za-z0-9_$]+\\.)*[A-Za-z0-9_$]+\\b";
     private static final String REGEX_CLASS_SLASH = "\\b(?:[A-Za-z0-9_$]+/)*[A-Za-z0-9_$]+\\b";