From 54f59ac04f3e21d5aecdd46bb1e7f4577924ab92 Mon Sep 17 00:00:00 2001 From: Alon Albert Date: Thu, 13 Jun 2013 13:27:15 -0700 Subject: Update Retrace Default Regex to Latest Version So it supports Android Bugreport Syntax Change-Id: I09713b53364a2e4cda44ee67325f183a54075433 --- lib/retrace.jar | Bin 6888 -> 7556 bytes src/proguard/retrace/ReTrace.java | 7 +++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/retrace.jar b/lib/retrace.jar index 8e42e5a..ea5998b 100644 Binary files a/lib/retrace.jar and b/lib/retrace.jar differ 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"; -- cgit v1.2.3