Fix java target naming exceptions in third_party/

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.
 
 # Do not add any imports to non-//build directories here.
 # Some projects (e.g. V8) do not have non-build directories DEPS'ed in.
 import("//build/config/android/config.gni")
 import("//build/config/android/internal_rules.gni")
 import("//build/config/compiler/compiler.gni")
 import("//build/config/dcheck_always_on.gni")
@@ skipping 1593 matching lines @@
       android_manifest = _android_manifest
 
       deps = _android_manifest_deps
 
       if (defined(invoker.deps)) {
         possible_config_deps = invoker.deps
       }
 
       # Added emma to the target's classpath via its .build_config.
       if (emma_coverage && !_emma_never_instrument) {
-        possible_config_deps += [ "//third_party/android_tools:emma_device" ]
+        possible_config_deps +=
+            [ "//third_party/android_tools:emma_device_java" ]
       }
 
       proguard_enabled = _proguard_enabled
       if (_proguard_enabled) {
         proguard_info = "$_proguard_output_jar_path.info"
       }
 
       # Don't depend on the runtime_deps target in order to avoid having to
       # build the native libraries just to create the .build_config file.
       # The dep is unnecessary since the runtime_deps file is created by gn gen
@@ skipping 144 matching lines @@
       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" ]
       }
       if (emma_coverage && !_emma_never_instrument) {
-        deps += [ "//third_party/android_tools:emma_device" ]
+        deps += [ "//third_party/android_tools:emma_device_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") {
@@ skipping 969 matching lines @@
         # because in practice they seem to contain classes required to be in the
         # classpath.
         deps += _subjar_targets
       }
       if (defined(_res_target_name)) {
         deps += [ ":$_res_target_name" ]
       }
     }
   }
 }