[Android] Change proguard newline handling.

build/android/pylib/utils/proguard.py

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import os
 import re
 import tempfile
 
 from pylib import constants
 from pylib import cmd_helper
 
 
 _PROGUARD_CLASS_RE = re.compile(r'\s*?- Program class:\s*([\S]+)$')
 _PROGUARD_SUPERCLASS_RE = re.compile(r'\s*?  Superclass:\s*([\S]+)$')
+_PROGUARD_SECTION_RE = re.compile(
+    r'^(?:Interfaces|Constant Pool|Fields|Methods|Class file attributes) '
+    r'\(count = \d+\):$')
 _PROGUARD_METHOD_RE = re.compile(r'\s*?- Method:\s*(\S*)[(].*$')
 _PROGUARD_ANNOTATION_RE = re.compile(r'\s*?- Annotation \[L(\S*);\]:$')
 _PROGUARD_ANNOTATION_CONST_RE = (
     re.compile(r'\s*?- Constant element value.*$'))
 _PROGUARD_ANNOTATION_VALUE_RE = re.compile(r'\s*?- \S+? \[(.*)\]$')
 
 _PROGUARD_PATH_SDK = os.path.join(
     constants.ANDROID_SDK_ROOT, 'tools', 'proguard', 'lib', 'proguard.jar')
 _PROGUARD_PATH_BUILT = (
     os.path.join(os.environ['ANDROID_BUILD_TOP'], 'external', 'proguard',
@@ skipping 46 matching lines @@
     }
 
     annotation = None
     annotation_has_value = False
     class_result = None
     method_result = None
 
     for line in proguard_output:
       line = line.strip('\r\n')
 
-      if len(line) == 0:
-        annotation = None
-        annotation_has_value = False
-        method_result = None
-        continue
-
       m = _PROGUARD_CLASS_RE.match(line)
       if m:
         class_result = {
           'class': m.group(1).replace('/', '.'),
           'superclass': '',
           'annotations': {},
           'methods': [],
         }
         results['classes'].append(class_result)
         annotation = None
         annotation_has_value = False
         method_result = None
         continue
 
       if not class_result:
         continue
 
       m = _PROGUARD_SUPERCLASS_RE.match(line)
       if m:
         class_result['superclass'] = m.group(1).replace('/', '.')
         continue
 
+      m = _PROGUARD_SECTION_RE.match(line)
+      if m:
+        annotation = None
+        annotation_has_value = False
+        method_result = None
+        continue
+
       m = _PROGUARD_METHOD_RE.match(line)
       if m:
         method_result = {
           'method': m.group(1),
           'annotations': {},
         }
         class_result['methods'].append(method_result)
         annotation = None
         annotation_has_value = False
         continue
@@ skipping 16 matching lines @@
           m = _PROGUARD_ANNOTATION_VALUE_RE.match(line)
           if m:
             if method_result:
               method_result['annotations'][annotation] = m.group(1)
             else:
               class_result['annotations'][annotation] = m.group(1)
           annotation_has_value = None
 
   return results