Merge "Ignore comment lines in proguard mapping."

2 files changed, 11 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 79a737cc18..5c21a9ed0a 100644
--- a/tools/ahat/src/main/com/android/ahat/proguard/ProguardMap.java
+++ b/tools/ahat/src/main/com/android/ahat/proguard/ProguardMap.java
@@ -184,6 +184,12 @@ public class ProguardMap {
     BufferedReader reader = new BufferedReader(mapReader);
     String line = reader.readLine();
     while (line != null) {
+      // Comment lines start with '#'. Skip over them.
+      if (line.startsWith("#")) {
+        line = reader.readLine();
+        continue;
+      }
+
       // Class lines are of the form:
       //   'clear.class.name -> obfuscated_class_name:'
       int sep = line.indexOf(" -> ");
diff --git a/tools/ahat/src/test/com/android/ahat/ProguardMapTest.java b/tools/ahat/src/test/com/android/ahat/ProguardMapTest.java
index 02976b5285..a9952ee3fd 100644
--- a/tools/ahat/src/test/com/android/ahat/ProguardMapTest.java
+++ b/tools/ahat/src/test/com/android/ahat/ProguardMapTest.java
@@ -25,7 +25,11 @@ import static org.junit.Assert.assertEquals;
 
 public class ProguardMapTest {
   private static final String TEST_MAP =
-    "class.that.is.Empty -> a:\n"
+      "# compiler: richard\n"
+    + "# compiler_version: 3.0-dev\n"
+    + "# min_api: 10000\n"
+    + "# compiler_hash: b7e25308967a577aa1f05a4b5a745c26\n"
+    + "class.that.is.Empty -> a:\n"
     + "class.that.is.Empty$subclass -> b:\n"
     + "class.with.only.Fields -> c:\n"
     + "    int prim_type_field -> a\n"