diff options
author | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2013-11-01 16:04:47 +0000 |
---|---|---|
committer | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2013-11-01 16:04:47 +0000 |
commit | fe926bab25e3af81265d4e0bbb79bcdb41b10635 (patch) | |
tree | 45d53aadfe83da2141878a46a44ed22795dd7294 | |
parent | 0efe0e7114815cd6d81b235a3bc5da4e8430455a (diff) | |
parent | 54f59ac04f3e21d5aecdd46bb1e7f4577924ab92 (diff) | |
download | android_external_proguard-fe926bab25e3af81265d4e0bbb79bcdb41b10635.tar.gz android_external_proguard-fe926bab25e3af81265d4e0bbb79bcdb41b10635.tar.bz2 android_external_proguard-fe926bab25e3af81265d4e0bbb79bcdb41b10635.zip |
Merge tag 'android-4.4_r1' into cm-11.0cm-11.0-XNPH44S-bacon-5fa8c79c0bcm-11.0-XNPH33R-bacon-3628510d76cm-11.0-XNPH30O-bacon-4f280f505acm-11.0-XNPH25R-bacon-d22b777afacm-11.0-XNPH22R-bacon-03d77315ea
Android 4.4 Release 1.0
-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"; |