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

build/android/gyp/write_build_config.py

 #!/usr/bin/env python
 #
 # 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.
 
 """Writes a build_config file.
 
 The build_config file for a target is a json file containing information about
 how to build that target based on the target's dependencies. This includes
@@ skipping 32 matching lines @@
 
 
 class AndroidManifest(object):
   def __init__(self, path):
     self.path = path
     dom = xml.dom.minidom.parse(path)
     manifests = dom.getElementsByTagName('manifest')
     assert len(manifests) == 1
     self.manifest = manifests[0]
 
-  def GetInstrumentation(self):
+  def GetInstrumentationElements(self):
     instrumentation_els = self.manifest.getElementsByTagName('instrumentation')
     if len(instrumentation_els) == 0:
       return None
-    if len(instrumentation_els) != 1:
-      raise Exception(
-          'More than one <instrumentation> element found in %s' % self.path)
-    return instrumentation_els[0]
+    return instrumentation_els
 
-  def CheckInstrumentation(self, expected_package):
-    instr = self.GetInstrumentation()
-    if not instr:
+  def CheckInstrumentationElements(self, expected_package):
+    instrs = self.GetInstrumentationElements()
+    if not instrs:
       raise Exception('No <instrumentation> elements found in %s' % self.path)
-    instrumented_package = instr.getAttributeNS(
-        'http://schemas.android.com/apk/res/android', 'targetPackage')
-    if instrumented_package != expected_package:
-      raise Exception(
-          'Wrong instrumented package. Expected %s, got %s'
-          % (expected_package, instrumented_package))
+    for instr in instrs:
+      instrumented_package = instr.getAttributeNS(
+          'http://schemas.android.com/apk/res/android', 'targetPackage')
+      if instrumented_package != expected_package:
+        raise Exception(
+            'Wrong instrumented package. Expected %s, got %s'
+            % (expected_package, instrumented_package))
 
   def GetPackageName(self):
     return self.manifest.getAttribute('package')
 
 
 dep_config_cache = {}
 def GetDepConfig(path):
   if not path in dep_config_cache:
     dep_config_cache[path] = build_utils.ReadJson(path)['deps_info']
   return dep_config_cache[path]
@@ skipping 489 matching lines @@
   # With ProGuard: Each library's .jar file is fed into ProGuard, which outputs
   # a single .jar, which is then dexed into a classes.dex. A test apk includes
   # all jar files from the program and the tests because having them separate
   # doesn't work with ProGuard's whole-program optimizations. Although the
   # apk-under-test still has all of its code in its classes.dex, none of it is
   # used at runtime because the copy of it within the test apk takes precidence.
   if options.type == 'android_apk' and options.tested_apk_config:
     tested_apk_config = GetDepConfig(options.tested_apk_config)
 
     expected_tested_package = tested_apk_config['package_name']
-    AndroidManifest(options.android_manifest).CheckInstrumentation(
+    AndroidManifest(options.android_manifest).CheckInstrumentationElements(
         expected_tested_package)
     if options.proguard_enabled:
       # Add all tested classes to the test's classpath to ensure that the test's
       # java code is a superset of the tested apk's java code
       java_full_classpath += [
           jar for jar in tested_apk_config['java']['full_classpath']
           if jar not in java_full_classpath]
 
     if tested_apk_config['proguard_enabled']:
       assert options.proguard_enabled, ('proguard must be enabled for '
@@ skipping 54 matching lines @@
 
     config['dist_jar'] = {
       'dependency_jars': dependency_jars,
       'all_interface_jars': all_interface_jars,
     }
 
   if options.type == 'android_apk':
     dependency_jars = [c['jar_path'] for c in all_library_deps]
     manifest = AndroidManifest(options.android_manifest)
     deps_info['package_name'] = manifest.GetPackageName()
-    if not options.tested_apk_config and manifest.GetInstrumentation():
+    if not options.tested_apk_config and manifest.GetInstrumentationElements():
       # This must then have instrumentation only for itself.
-      manifest.CheckInstrumentation(manifest.GetPackageName())
+      manifest.CheckInstrumentationElements(manifest.GetPackageName())
 
     library_paths = []
     java_libraries_list = None
     runtime_deps_files = build_utils.ParseGnList(
         options.shared_libraries_runtime_deps or '[]')
     if runtime_deps_files:
       library_paths = _ExtractSharedLibsFromRuntimeDeps(runtime_deps_files)
       java_libraries_list = _CreateJavaLibrariesList(library_paths)
 
     secondary_abi_library_paths = []
@@ skipping 35 matching lines @@
     deps_info['java_resources_jar'] = options.java_resources_jar_path
 
   build_utils.WriteJson(config, options.build_config, only_if_changed=True)
 
   if options.depfile:
     build_utils.WriteDepfile(options.depfile, options.build_config, all_inputs)
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv[1:]))