diff options
| -rw-r--r-- | lib/retrace.jar | bin | 6888 -> 7556 bytes | |||
| -rw-r--r-- | src/proguard/retrace/ReTrace.java | 7 |
2 files changed, 5 insertions, 2 deletions
diff --git a/lib/retrace.jar b/lib/retrace.jar Binary files differindex 8e42e5a..ea5998b 100644 --- a/lib/retrace.jar +++ b/lib/retrace.jar 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 @@ implements MappingProcessor 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"; |