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

build/config/android/internal_rules.gni

Index: build/config/android/internal_rules.gni
diff --git a/build/config/android/internal_rules.gni b/build/config/android/internal_rules.gni
index 1bc02b2d9a3590e9643239d5792886a922f23f83..76f3b3c89a70b75fe9aacfe9ff3525ae4eb9d6ea 100644
--- a/build/config/android/internal_rules.gni
+++ b/build/config/android/internal_rules.gni
@@ -1054,11 +1054,6 @@ template("compile_java") {
   # 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)
 
@@ -1080,14 +1075,14 @@ template("compile_java") {
       _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",
@@ -1165,6 +1160,7 @@ template("java_library_impl") {
       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"
@@ -1265,8 +1261,6 @@ template("java_library_impl") {
     srcjar_deps = _srcjar_deps
     srcjars = _srcjars
     chromium_code = _chromium_code
-    android = _requires_android
-
     supports_android = _supports_android
     deps = build_config_deps
   }