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 500 matching lines @@
     config['resources']['extra_r_text_files'] = [
         c['r_text'] for c in all_resources_deps if 'r_text' in c]
 
   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.
+  # An instrumentation test apk should include the java that is in the apk under

[jbudorick, 2016/07/28 16:56:00]

Why should we do this two different ways rather than always merging the APKs?

[smaier, 2016/07/28 18:09:51]

ProGuard is the tool which does the merging. Thus, ProGuard on -> merging,
ProGuard off -> no merging.

[jbudorick, 2016/07/28 18:18:22]

I seem to have entirely misunderstood what you meant in your doc, then. I was
under the impression that you had been intending to change the dex exclusion
logic below to stop excluding the code from the apk under test.

+  # test if ProGuard is enabled, but exclude that java if ProGuard is disabled.
   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(
         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 '
           '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.

[jbudorick, 2016/07/28 18:18:22]

(I expected a change here.)

[smaier, 2016/07/28 19:19:19]

Sadly, this code applies only to the non-proguard case - ProGuard duplicated
this logic within proguard_util.py, which is what I changed.

[jbudorick, 2016/07/28 19:25:14]

So why isn't it changing here as well...?

     # 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]
 
   if options.type == 'android_apk':
     deps_info['proguard_enabled'] = options.proguard_enabled
     deps_info['proguard_info'] = options.proguard_info
     config['proguard'] = {}
     proguard_config = config['proguard']
     proguard_config['input_paths'] = [options.jar_path] + java_full_classpath
 
   # Dependencies for the final dex file of an apk or a 'deps_dex'.
   if options.type in ['android_apk', 'deps_dex']:
     config['final_dex'] = {}
     dex_config = config['final_dex']
     dex_config['dependency_dex_files'] = deps_dex_files
 
   if options.type in ('java_binary', 'java_library', 'android_apk'):
     config['javac']['classpath'] = javac_classpath
     config['javac']['interface_classpath'] = [
         _AsInterfaceJar(p) for p in javac_classpath]
-    config['java'] = {
+    deps_info['java'] = {
       'full_classpath': java_full_classpath
     }
 
   if options.type == 'android_apk':
     dependency_jars = [c['jar_path'] for c in all_library_deps]
     all_interface_jars = [
         _AsInterfaceJar(p) for p in dependency_jars + [options.jar_path]]
     config['dist_jar'] = {
       'dependency_jars': dependency_jars,
       'all_interface_jars': all_interface_jars,
@@ skipping 24 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:]))