diff options
| author | Ying Wang <wangying@google.com> | 2013-09-20 16:17:43 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2013-09-20 16:32:42 -0700 |
| commit | b9cc48a43ed984587c939d02fba5316bf5c0df6e (patch) | |
| tree | 7d42e31a97264803b1147ef6001e8a5e6968a122 /src/proguard/retrace/ReTrace.java | |
| parent | 54f59ac04f3e21d5aecdd46bb1e7f4577924ab92 (diff) | |
| download | external_proguard-b9cc48a43ed984587c939d02fba5316bf5c0df6e.tar.gz external_proguard-b9cc48a43ed984587c939d02fba5316bf5c0df6e.tar.bz2 external_proguard-b9cc48a43ed984587c939d02fba5316bf5c0df6e.zip | |
Upgrade Proguard to 4.10.
Downloaded from:
http://sourceforge.net/projects/proguard/files/proguard/4.10/
Bug: 8992787
Change-Id: Ia07cc5b3feed443982b7e8f2a1f361479e735b18
Diffstat (limited to 'src/proguard/retrace/ReTrace.java')
| -rw-r--r-- | src/proguard/retrace/ReTrace.java | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/proguard/retrace/ReTrace.java b/src/proguard/retrace/ReTrace.java index bf6a145..91ab2a7 100644 --- a/src/proguard/retrace/ReTrace.java +++ b/src/proguard/retrace/ReTrace.java @@ -2,7 +2,7 @@ * ProGuard -- shrinking, optimization, obfuscation, and preverification * of Java bytecode. * - * Copyright (c) 2002-2009 Eric Lafortune (eric@graphics.cornell.edu) + * Copyright (c) 2002-2013 Eric Lafortune (eric@graphics.cornell.edu) * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the Free @@ -40,17 +40,14 @@ implements MappingProcessor private static final String REGEX_OPTION = "-regex"; private static final String VERBOSE_OPTION = "-verbose"; - // 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"; private static final String REGEX_LINE_NUMBER = "\\b[0-9]+\\b"; private static final String REGEX_TYPE = REGEX_CLASS + "(?:\\[\\])*"; - private static final String REGEX_MEMBER = "\\b[A-Za-z0-9_$]+\\b"; + private static final String REGEX_MEMBER = "<?\\b[A-Za-z0-9_$]+\\b>?"; private static final String REGEX_ARGUMENTS = "(?:" + REGEX_TYPE + "(?:\\s*,\\s*" + REGEX_TYPE + ")*)?"; // The class settings. |