Reland allow JUnit3/4 tests within the same apk to be run by test_runner

build/android/pylib/utils/dexdump.py

 # Copyright 2016 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 shutil
 import tempfile
 from xml.etree import ElementTree
 
 from devil.utils import cmd_helper
@@ skipping 49 matching lines @@
           <parameter name="Param" type="int">
           </parameter>
         </method>
       </class>
     </package>
   </api>
   """
   results = {}
   for child in root:
     if child.tag == 'package':
-      results[child.attrib['name']] = _ParsePackageNode(child)
+      package_name = child.attrib['name']
+      parsed_node = _ParsePackageNode(child)
+      if package_name in results:
+        results[package_name]['classes'].update(parsed_node['classes'])
+      else:
+        results[package_name] = parsed_node
   return results
 
 
 def _ParsePackageNode(package_node):
   """Parses a <package> node from the dexdump xml output.
 
   Returns:
     A dict in the format:
       {
         'classes': {
@@ skipping 19 matching lines @@
   Returns:
     A dict in the format:
       {
         'methods': [<method_1>, <method_2>]
       }
   """
   methods = []
   for child in class_node:
     if child.tag == 'method':
       methods.append(child.attrib['name'])
-  return {'methods': methods}
+  return {'methods': methods, 'superclass': class_node.attrib['extends']}