Reland of Make instrumentation_test_apk depend on their apk_under_test.

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 1539 matching lines @@
       java_files = []
     }
     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 (defined(invoker.apk_under_test)) {
+      deps += [ "${invoker.apk_under_test}__java" ]
+    }
   }
 
   # 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"
@@ skipping 35 matching lines @@
         ":$build_config_target",
         ":$java_target",
         ":$process_resources_target",
       ]
       inputs = [
                  _build_config,
                  _jar_path,
                ] + _proguard_configs
 
       output_jar_path = _proguard_jar_path
-      rebased_proguard_configs = rebase_path(_proguard_configs, root_build_dir)
+      _rebased_proguard_configs = rebase_path(_proguard_configs, root_build_dir)
       args = [
-        "--proguard-configs=$rebased_proguard_configs",
-        "--tested-apk-info=@FileArg($_rebased_build_config:proguard:tested_apk_info)",
+        "--proguard-configs=$_rebased_proguard_configs",
         "--input-paths=@FileArg($_rebased_build_config:proguard:input_paths)",
       ]
+      if (defined(invoker.apk_under_test)) {
+        deps += [
+          "${invoker.apk_under_test}__build_config",
+          "${invoker.apk_under_test}__proguard",
+        ]
+        _apk_under_test_build_config =
+            get_label_info(invoker.apk_under_test, "target_gen_dir") + "/" +
+            get_label_info(invoker.apk_under_test, "name") + ".build_config"
+        _rebased_apk_under_test_build_config =
+            rebase_path(_apk_under_test_build_config, root_build_dir)
+        args += [ "--tested-apk-info=@FileArg($_rebased_apk_under_test_build_config:deps_info:proguard_info)" ]
+      }
     }
     _dex_sources = [ _proguard_jar_path ]
     _dex_deps = [ ":$_proguard_target" ]
   } else {
     if (enable_multidex) {
       _dex_sources = [ _jar_path ]
     } else {
       _dex_sources = [ _lib_dex_path ]
     }
     _dex_deps = [ ":$java_target" ]
@@ skipping 754 matching lines @@
       "--target",
       rebase_path(invoker.target, root_build_dir),
       "--output-directory",
       rebase_path(root_out_dir, root_build_dir),
     ]
     if (defined(invoker.flag_name)) {
       args += [ "--flag-name=${invoker.flag_name}" ]
     }
   }
 }