summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--tools/ahat/src/main/com/android/ahat/proguard/ProguardMap.java9
1 files changed, 8 insertions, 1 deletions
diff --git a/tools/ahat/src/main/com/android/ahat/proguard/ProguardMap.java b/tools/ahat/src/main/com/android/ahat/proguard/ProguardMap.java
index 88231dd19e..f2f2383a24 100644
--- a/tools/ahat/src/main/com/android/ahat/proguard/ProguardMap.java
+++ b/tools/ahat/src/main/com/android/ahat/proguard/ProguardMap.java
@@ -232,8 +232,15 @@ public class ProguardMap {
// After the class line comes zero or more field/method lines of the form:
// ' type clearName -> obfuscatedName'
+ // '# comment line'
line = reader.readLine();
- while (line != null && line.startsWith(" ")) {
+ while (line != null && (line.startsWith(" ") || line.startsWith("#"))) {
+ // Comment lines start with '#' and may occur anywhere in the file.
+ // Skip over them.
+ if (line.startsWith("#")) {
+ line = reader.readLine();
+ continue;
+ }
String trimmed = line.trim();
int ws = trimmed.indexOf(' ');
sep = trimmed.indexOf(" -> ");