Merging under test java into instrumentation test java.

build/config/android/internal_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("//build/config/android/config.gni")
 import("//build/config/sanitizers/sanitizers.gni")
 
 assert(is_android)
 
 # These identify targets that have .build_config files (except for android_apk,
@@ skipping 780 matching lines @@
         depfile,
         java_script,
       ]
       forward_variables_from(invoker, [ "deps" ])
       _rebased_build_config = rebase_path(_build_config, root_build_dir)
       args = [
         "--depfile",
         rebase_path(depfile, root_build_dir),
         "--output",
         rebase_path(java_script, root_build_dir),
-        "--classpath=@FileArg($_rebased_build_config:java:full_classpath)",
+        "--classpath=@FileArg($_rebased_build_config:deps_info:java:full_classpath)",
         "--jar-path",
         rebase_path(_jar_path, root_build_dir),
         "--main-class",
         _main_class,
       ]
       if (emma_coverage) {
         args += [
           "--classpath",
           rebase_path("//third_party/android_tools/sdk/tools/lib/emma.jar",
                       root_build_dir),
@@ skipping 1749 matching lines @@
       outputs = [
         depfile,
         invoker.out_manifest,
       ]
       inputs = [
         invoker.main_manifest,
       ]
     }
   }
 }