GN: Fix support errorprone and java_binary

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")
 
 assert(is_android)
 
 rebased_android_sdk = rebase_path(android_sdk, root_build_dir)
 rebased_android_sdk_root = rebase_path(android_sdk_root, root_build_dir)
@@ skipping 820 matching lines @@
   _jar_path = _base_path + ".jar"
   _build_config = _base_path + ".build_config"
 
   if (_supports_android) {
     _dex_path = _base_path + ".dex.jar"
   }
   _deps = []
   if (defined(invoker.deps)) {
     _deps = invoker.deps
   }
+  _jar_deps = []
+  if (defined(invoker.jar_dep)) {
+    _jar_deps = [ invoker.jar_dep ]
+  }
 
   _template_name = target_name
 
   build_config_target_name = "${_template_name}__build_config"
   process_jar_target_name = "${_template_name}__process_jar"
   if (_supports_android) {
     dex_target_name = "${_template_name}__dex"
   }
 
   write_build_config(build_config_target_name) {
@@ skipping 18 matching lines @@
 
     if (defined(invoker.proguard_preprocess) && invoker.proguard_preprocess) {
       proguard_preprocess = true
       proguard_config = invoker.proguard_config
     }
 
     build_config = _build_config
     input_jar_path = invoker.jar_path
     output_jar_path = _jar_path
 
-    deps = [ ":$build_config_target_name" ] + _deps
+    deps = [ ":$build_config_target_name" ] + _deps + _jar_deps
   }
 
   if (_supports_android) {
     dex(dex_target_name) {
       sources = [
         _jar_path,
       ]
       output = _dex_path
-      deps = [
-        ":$process_jar_target_name",
-      ]
+      deps = [ ":$process_jar_target_name" ] + _deps + _jar_deps
     }
   }
 
   group(target_name) {
     deps = [
       ":$process_jar_target_name",
     ]
     if (defined(invoker.data_deps)) {
       data_deps = invoker.data_deps
     }
@@ skipping 37 matching lines @@
   _jar_excluded_patterns = []
   if (defined(invoker.jar_excluded_patterns)) {
     _jar_excluded_patterns += invoker.jar_excluded_patterns
   }
 
   _chromium_code = false
   if (defined(invoker.chromium_code)) {
     _chromium_code = invoker.chromium_code
   }
 
+  _supports_android = true
+  if (defined(invoker.supports_android)) {
+    _supports_android = invoker.supports_android
+  }
+
   _enable_errorprone = use_errorprone_java_compiler
   if (defined(invoker.enable_errorprone)) {
     _enable_errorprone = invoker.enable_errorprone
   }
 
   _manifest_entries = []
   if (defined(invoker.manifest_entries)) {
     _manifest_entries = invoker.manifest_entries
   }
 
@@ skipping 36 matching lines @@
     }
 
     outputs = [
       depfile,
       _intermediate_jar_path,
       _intermediate_jar_path + ".md5.stamp",
     ]
     sources = _java_files + _java_srcjars
     inputs = _system_jars + [ _build_config ]
 
-    _rebased_android_sdk_jar = rebase_path(android_sdk_jar, root_build_dir)
     _rebased_system_jars = rebase_path(_system_jars, root_build_dir)
     _rebased_java_srcjars = rebase_path(_java_srcjars, root_build_dir)
     _rebased_depfile = rebase_path(depfile, root_build_dir)
     args = [
       "--depfile=$_rebased_depfile",
-      "--bootclasspath=$_rebased_android_sdk_jar",
       "--classpath=$_rebased_system_jars",
       "--classpath=@FileArg($_rebased_build_config:javac:classpath)",
       "--jar-path=$_rebased_jar_path",
       "--java-srcjars=$_rebased_java_srcjars",
       "--java-srcjars=@FileArg($_rebased_build_config:javac:srcjars)",
       "--jar-excluded-classes=$_jar_excluded_patterns",
     ]
+    if (_supports_android) {
+      _rebased_android_sdk_jar = rebase_path(android_sdk_jar, root_build_dir)
+      args += [ "--bootclasspath=$_rebased_android_sdk_jar" ]
+    }
     foreach(e, _manifest_entries) {
       args += [ "--manifest-entry=" + e ]
     }
     if (_chromium_code) {
       args += [ "--chromium-code=1" ]
     }
     if (_enable_errorprone) {
       deps += [ "//third_party/errorprone:chromium_errorprone" ]
       args += [
         "--use-errorprone-path",
@@ skipping 143 matching lines @@
   compile_java(_compile_java_target) {
     jar_path = _jar_path
     build_config = _build_config
     java_files = _java_files
     srcjar_deps = _srcjar_deps
     srcjars = _srcjars
     chromium_code = _chromium_code
     android = _requires_android
 
     if (defined(invoker.enable_errorprone)) {
-      _enable_errorprone = invoker.enable_errorprone
+      enable_errorprone = invoker.enable_errorprone
     }
     if (defined(invoker.jar_excluded_patterns)) {
       jar_excluded_patterns = invoker.jar_excluded_patterns
     }
     if (defined(invoker.proguard_preprocess)) {
       proguard_preprocess = invoker.proguard_preprocess
     }
     if (defined(invoker.proguard_config)) {
       proguard_config = invoker.proguard_config
     }
     if (defined(invoker.dist_jar_path)) {
       dist_jar_path = invoker.dist_jar_path
     }
     if (defined(invoker.manifest_entries)) {
       manifest_entries = invoker.manifest_entries
     }
 
+    supports_android = _supports_android
     deps = build_config_deps
   }
 
   if (defined(invoker.main_class)) {
     _final_deps += [ ":${_template_name}__binary_script" ]
     action("${_template_name}__binary_script") {
       script = "//build/android/gyp/create_java_binary_script.py"
       depfile = "$target_gen_dir/$target_name.d"
       java_script = "$root_build_dir/bin/$_template_name"
       inputs = [
@@ skipping 362 matching lines @@
     ]
     args = [
       "--depfile",
       rebase_path(depfile, root_build_dir),
       "--script-output-path",
       rebase_path(generated_script, root_build_dir),
     ]
     args += test_runner_args
   }
 }