GN: Fix support errorprone and java_binary

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("//third_party/android_platform/config.gni")
 import("//tools/grit/grit_rule.gni")
 
@@ skipping 890 matching lines @@
     if (defined(invoker.srcjars)) {
       srcjars = invoker.srcjars
     }
     if (defined(invoker.bypass_platform_checks)) {
       bypass_platform_checks = invoker.bypass_platform_checks
     }
     if (defined(invoker.testonly)) {
       testonly = invoker.testonly
     }
 
+    supports_android = false
     main_class = invoker.main_class
   }
 }
 
 # Declare a Junit executable target
 #
 # This target creates an executable from java code for running as a junit test
 # suite. The executable will be in the output folder's /bin/ directory.
 #
 # Variables
@@ skipping 151 matching lines @@
     }
   }
 }
 
 # Declare a java library target for a prebuilt jar
 #
 # Variables
 #   deps: Specifies the dependencies of this target. Java targets in this list
 #     will be added to the javac classpath.
 #   jar_path: Path to the prebuilt jar.
+#   jar_dep: Target that builds jar_path (optional).
 #   proguard_preprocess: If true, proguard preprocessing will be run. This can
 #     be used to remove unwanted parts of the library.
 #   proguard_config: Path to the proguard config for preprocessing.
 #
 # Example
 #   java_prebuilt("foo_java") {
 #     jar_path = "foo.jar"
 #     deps = [
 #       ":foo_resources",
 #       ":bar_java"
 #     ]
 #   }
 template("java_prebuilt") {
   set_sources_assignment_filter([])
   java_prebuilt_impl(target_name) {
     jar_path = invoker.jar_path
+    if (defined(invoker.jar_dep)) {
+      jar_dep = invoker.jar_dep
+    }
     if (defined(invoker.testonly)) {
       testonly = invoker.testonly
     }
     if (defined(invoker.deps)) {
       deps = invoker.deps
     }
     if (defined(invoker.data_deps)) {
       data_deps = invoker.data_deps
     }
     if (defined(invoker.proguard_config)) {
@@ skipping 1112 matching lines @@
 template("uiautomator_test") {
   set_sources_assignment_filter([])
   if (defined(invoker.testonly)) {
     testonly = invoker.testonly
   }
   assert(target_name != "")
   assert(invoker.deps != [] || true)
   group(target_name) {
   }
 }