Merging under test java into instrumentation test java.

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 63 matching lines @@
     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]
 
 
+config_cache = {}
+def GetConfig(path):
+  if not path in config_cache:
+    config_cache[path] = build_utils.ReadJson(path)
+  return config_cache[path]
+
+
 def DepsOfType(wanted_type, configs):
   return [c for c in configs if c['type'] == wanted_type]
 
 
 def GetAllDepsConfigsInOrder(deps_config_paths):
   def GetDeps(path):
     return set(GetDepConfig(path)['deps_configs'])
   return build_utils.GetSortedTransitiveDependencies(deps_config_paths, GetDeps)
 
 
@@ skipping 172 matching lines @@
   parser.add_option('--apk-path', help='Path to the target\'s apk output.')
   parser.add_option('--incremental-apk-path',
                     help="Path to the target's incremental apk output.")
   parser.add_option('--incremental-install-script-path',
                     help="Path to the target's generated incremental install "
                     "script.")
 
   parser.add_option('--tested-apk-config',
       help='Path to the build config of the tested apk (for an instrumentation '
       'test apk).')
+  parser.add_option('--merge-tested-apk', action='store_true',
+      help='Whether to merge the test apk and tested apk into one.')

[agrieve, 2016/07/28 01:30:57]

nit: "Whether to add all jars from test-apk-config into this config's full
classpath."

[smaier, 2016/07/28 15:27:18]

Done.

   parser.add_option('--proguard-enabled', action='store_true',
       help='Whether proguard is enabled for this apk.')
   parser.add_option('--proguard-info',
       help='Path to the proguard .info output for this apk.')
   parser.add_option('--has-alternative-locale-resource', action='store_true',
       help='Whether there is alternative-locale-resource in direct deps')
 
   options, args = parser.parse_args(argv)
 
   if args:
@@ skipping 228 matching lines @@
   if options.type in ['android_apk', 'deps_dex']:
     deps_dex_files = [c['dex_path'] for c in all_library_deps]
 
   if options.type in ('java_binary', 'java_library', 'android_apk'):
     javac_classpath = [c['jar_path'] for c in direct_library_deps]
     java_full_classpath = [c['jar_path'] for c in all_library_deps]
 
   # An instrumentation test apk should exclude the dex files that are in the apk
   # under test.
   if options.type == 'android_apk' and options.tested_apk_config:
-    tested_apk_config = GetDepConfig(options.tested_apk_config)
+    tested_apk_config = GetConfig(options.tested_apk_config)

[agrieve, 2016/07/28 01:30:57]

rather than expose the top-level config, we should just move
['java']['full_classpath'] to appear within deps_info. You'll just need to
update the @FileArg spots in .gni that reference it.

[smaier, 2016/07/28 15:27:18]

Done.

+    tested_apk_dep_config = GetDepConfig(options.tested_apk_config)
 
-    expected_tested_package = tested_apk_config['package_name']
+    expected_tested_package = tested_apk_dep_config['package_name']
     AndroidManifest(options.android_manifest).CheckInstrumentation(
         expected_tested_package)
-    if tested_apk_config['proguard_enabled']:
+    if options.merge_tested_apk:
+      # 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]
+
+    # Include in the classpath classes that are added directly to the apk under
+    # test (those that are not a part of a java_library).
+    javac_classpath.append(tested_apk_dep_config['jar_path'])
+    java_full_classpath.append(tested_apk_dep_config['jar_path'])
+
+    if tested_apk_dep_config['proguard_enabled']:
       assert options.proguard_enabled, ('proguard must be enabled for '
           'instrumentation apks if it\'s enabled for the tested apk.')
 
-    # Include in the classpath classes that are added directly to the apk under
-    # test (those that are not a part of a java_library).
-    javac_classpath.append(tested_apk_config['jar_path'])
-    java_full_classpath.append(tested_apk_config['jar_path'])
 
     # Exclude dex files from the test apk that exist within the apk under test.
     # TODO(agrieve): When proguard is enabled, this filtering logic happens
     #     within proguard_util.py. Move the logic for the proguard case into
     #     here as well.
     tested_apk_library_deps = tested_apk_deps.All('java_library')
     tested_apk_deps_dex_files = [c['dex_path'] for c in tested_apk_library_deps]
     deps_dex_files = [
         p for p in deps_dex_files if not p in tested_apk_deps_dex_files]
 
@@ skipping 52 matching lines @@
         _MergeAssets(deps.All('android_assets')))
 
   build_utils.WriteJson(config, options.build_config, only_if_changed=True)
 
   if options.depfile:
     build_utils.WriteDepfile(options.depfile, all_inputs)
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv[1:]))