Create dist jars only for instrumentation apks; use ijars for them

build/config/android/rules.gni

 # 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("//base/android/linker/config.gni")
 import("//build/config/android/config.gni")
 import("//build/config/android/internal_rules.gni")
 import("//build/config/sanitizers/sanitizers.gni")
 import("//build/toolchain/toolchain.gni")
 import("//third_party/android_platform/config.gni")
@@ skipping 1173 matching lines @@
 # and (possibly) native libraries.
 #
 # Variables
 #   alternative_android_sdk_jar: The alternative android sdk jar used in
 #     proguard.
 #   android_aapt_path: Android aapt tool to replace default one to build
 #     resource.
 #   android_manifest: Path to AndroidManifest.xml.
 #   android_manifest_dep: Target that generates AndroidManifest (if applicable)
 #   chromium_code: If true, extra analysis warning/errors will be enabled.
+#   create_dist_ijar: Whether to define the "${target_name}_dist_ijar" target
+#     (used by instrumentation_test_apk).
 #   data_deps: List of dependencies needed at runtime. These will be built but
 #     won't change the generated .apk in any way (in fact they may be built
 #     after the .apk is).
 #   deps: List of dependencies. All Android java resources and libraries in the
 #     "transitive closure" of these dependencies will be included in the apk.
 #     Note: this "transitive closure" actually only includes such targets if
 #     they are depended on through android_library or android_resources targets
 #     (and so not through builtin targets like 'action', 'group', etc).
 #   java_files: List of .java files to include in the apk.
 #   srcjar_deps: List of srcjar dependencies. The .java files in the srcjars
@@ skipping 71 matching lines @@
     final_dex_path = "$gen_dir/classes.dex"
   }
   final_dex_target_name = "${_template_name}__final_dex"
 
   _final_apk_path = ""
   if (defined(invoker.final_apk_path)) {
     _final_apk_path = invoker.final_apk_path
   } else if (defined(invoker.apk_name)) {
     _final_apk_path = "$root_build_dir/apks/" + invoker.apk_name + ".apk"
   }
-  _dist_jar_path_list =
-      process_file_template(
-          [ _final_apk_path ],
-          "$root_build_dir/test.lib.java/{{source_name_part}}.jar")
-  _dist_jar_path = _dist_jar_path_list[0]
   _final_apk_path_no_ext_list =
       process_file_template([ _final_apk_path ],
                             "{{source_dir}}/{{source_name_part}}")
   _final_apk_path_no_ext = _final_apk_path_no_ext_list[0]
   assert(_final_apk_path_no_ext != "")  # Mark as used.
 
   _native_libs = []
 
   _version_code = android_default_version_code
   if (defined(invoker.version_code)) {
@@ skipping 223 matching lines @@
     srcjar_deps = _srcjar_deps
     jar_path = _jar_path
     dex_path = _lib_dex_path
     emma_never_instrument = _emma_never_instrument
 
     if (defined(invoker.deps)) {
       deps += invoker.deps
     }
   }
 
-  if (_dist_jar_path != "") {
-    create_dist_target = "${_template_name}__create_dist_jar"
-    _final_deps += [ ":$create_dist_target" ]
-
-    # TODO(cjhopman): This is only ever needed to calculate the list of tests to
-    # run. See build/android/pylib/instrumentation/test_jar.py. We should be
-    # able to just do that calculation at build time instead.
-    action(create_dist_target) {
+  # TODO(cjhopman): This is only ever needed to calculate the list of tests to
+  # run. See build/android/pylib/instrumentation/test_jar.py. We should be
+  # able to just do that calculation at build time instead.
+  if (defined(invoker.create_dist_ijar) && invoker.create_dist_ijar) {
+    _dist_ijar_path = "$root_build_dir/test.lib.java/" +
+                      get_path_info(_final_apk_path, "name") + ".jar"
+    action("${_template_name}_dist_ijar") {
       script = "//build/android/gyp/create_dist_jar.py"
       depfile = "$target_gen_dir/$target_name.d"
       inputs = [
         _build_config,
       ]
       outputs = [
         depfile,
-        _dist_jar_path,
+        "${_dist_ijar_path}",
       ]
       args = [
         "--depfile",
         rebase_path(depfile, root_build_dir),
         "--output",
-        rebase_path(_dist_jar_path, root_build_dir),
+        rebase_path("${_dist_ijar_path}", root_build_dir),
+        "--use-ijars",

[jbudorick, 2016/02/08 16:24:12]

also, why is this GN-only?

[agrieve, 2016/02/08 16:42:01]

When I first added ijars, I was too lazy to port them to GYP as well :P

[jbudorick, 2016/02/08 16:59:11]

assuming you mean dist jars here instead of ijars

         "--inputs=@FileArg($_rebased_build_config:dist_jar:dependency_jars)",
       ]
       inputs += [ _jar_path ]
       _rebased_jar_path = rebase_path([ _jar_path ], root_build_dir)
       args += [ "--inputs=$_rebased_jar_path" ]
       deps = [
         ":$build_config_target",  # Generates the build config file.
         ":$java_target",  # Generates the jar file.
       ]
     }
@@ skipping 390 matching lines @@
     deps += [ "//testing/android/broker:broker_java" ]
     data_deps += [
       "//testing/android/driver:driver_apk",
       "//tools/android/forwarder2",
       "//tools/android/md5sum",
     ]
     if (defined(invoker.additional_apks)) {
       data_deps += invoker.additional_apks
     }
 
+    create_dist_ijar = true
     run_findbugs =
         defined(invoker.run_findbugs) && invoker.run_findbugs &&
         (defined(invoker.java_files) || defined(invoker.DEPRECATED_java_in_dir))
   }
 
   group(target_name) {
     public_deps = [
       ":$_apk_target_name",
       ":$_test_runner_target_name",
+
+      # Required by test runner to enumerate test list.
+      ":${_apk_target_name}_dist_ijar",
     ]
   }
 }
 
 # Declare an Android gtest apk
 #
 # This target creates an Android apk for running gtest-based unittests.
 #
 # Variables
 #   deps: Specifies the dependencies of this target. These will be passed to
@@ skipping 299 matching lines @@
   }
 
   android_library(target_name) {
     java_files = []
     srcjar_deps = [ ":${_template_name}__protoc_java" ]
     deps = [
       "//third_party/android_protobuf:protobuf_nano_javalib",
     ]
   }
 }