GN: Stop setting android.jar in both -classpath and -bootclasspath

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("//third_party/ijar/ijar.gni")
 
 assert(is_android)
 
 rebased_android_sdk = rebase_path(android_sdk, root_build_dir)
@@ skipping 1036 matching lines @@
   }
   foreach(dep, _srcjar_deps) {
     _dep_gen_dir = get_label_info(dep, "target_gen_dir")
     _dep_name = get_label_info(dep, "name")
     _java_srcjars += [ "$_dep_gen_dir/$_dep_name.srcjar" ]
   }
 
   # Mark srcjar_deps as used.
   assert(_srcjar_deps == [] || true)
 
-  _system_jars = []
-  if (defined(invoker.android) && invoker.android) {
-    _system_jars += [ android_sdk_jar ]
-  }
-
   _rebased_build_config = rebase_path(_build_config, root_build_dir)
   _rebased_jar_path = rebase_path(_intermediate_jar_path, root_build_dir)
 
   javac_target_name = "${target_name}__javac"
   finish_target_name = "${target_name}__finish"
   final_target_name = target_name
 
   action(javac_target_name) {
     script = "//build/android/gyp/javac.py"
     depfile = "$target_gen_dir/$target_name.d"
     deps = _srcjar_deps
     if (defined(invoker.deps)) {
       deps += invoker.deps
     }
 
     outputs = [
       depfile,
       _intermediate_jar_path,
       _intermediate_jar_path + ".md5.stamp",
     ]
     sources = _java_files + _java_srcjars
-    inputs = _system_jars + [ _build_config ]
+    inputs = [
+      _build_config,
+    ]
 
-    _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",
-      "--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" ]
     }
@@ skipping 57 matching lines @@
   _final_deps = []
   _final_datadeps = []
   if (defined(invoker.datadeps)) {
     _final_datadeps = invoker.datadeps
   }
 
   _supports_android =
       defined(invoker.supports_android) && invoker.supports_android
   _requires_android =
       defined(invoker.requires_android) && invoker.requires_android
+  assert(_requires_android || true)  # Mark as used.

[Dirk Pranke, 2015/09/03 20:11:30]

if this isn't actually used, why not delete it?

[agrieve, 2015/09/04 00:05:38]

It's still used in the write_build_config step. GN just complains if it's not
used on both sides of the condition. I could move it into the condition, but I
think it's nice to have this right beside  _supports_android.

[Dirk Pranke, 2015/09/04 00:54:09]

Hm. That kinda sounds like a bug in GN. Maybe file a bug and follow up w/ Brett?

lgtm in the meantime.

 
   if (_supports_android) {
     _dex_path = _base_path + ".dex.jar"
     if (defined(invoker.dex_path)) {
       _dex_path = invoker.dex_path
     }
   }
 
   # Define build_config_deps which will be a list of targets required to
   # build the _build_config.
@@ skipping 80 matching lines @@
                              "manifest_entries",
                              "proguard_config",
                              "proguard_preprocess",
                            ])
     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
-
     supports_android = _supports_android
     deps = build_config_deps
   }
 
   if (defined(invoker.main_class)) {
     _final_datadeps += [ ":${_template_name}__java_binary_script" ]
     java_binary_script("${_template_name}__java_binary_script") {
       build_config = _build_config
       jar_path = _jar_path
       main_class = invoker.main_class
@@ skipping 335 matching lines @@
     ]
     args = [
       "--depfile",
       rebase_path(depfile, root_build_dir),
       "--script-output-path",
       rebase_path(generated_script, root_build_dir),
     ]
     args += test_runner_args
   }
 }