GN(android): Distinguish java_binary from java_library in build_config

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("//build/config/sanitizers/sanitizers.gni")
 import("//build/config/zip.gni")
 import("//third_party/ijar/ijar.gni")
 
 assert(is_android)
@@ skipping 323 matching lines @@
 # See build/android/gyp/write_build_config.py and
 # build/android/gyp/util/build_utils.py:ExpandFileArgs
 template("write_build_config") {
   action(target_name) {
     set_sources_assignment_filter([])
     type = invoker.type
     build_config = invoker.build_config
 
     assert(type == "android_apk" || type == "java_library" ||
            type == "android_resources" || type == "deps_dex" ||
-           type == "android_assets" || type == "resource_rewriter")
+           type == "android_assets" || type == "resource_rewriter" ||
+           type == "java_binary")
 
     deps = []
     forward_variables_from(invoker,
                            [
                              "deps",
                              "testonly",
                              "visibility",
                            ])
 
     script = "//build/android/gyp/write_build_config.py"
@@ skipping 17 matching lines @@
     args = [
       "--type",
       type,
       "--depfile",
       rebase_path(depfile, root_build_dir),
       "--possible-deps-configs=$rebase_possible_deps_configs",
       "--build-config",
       rebase_path(build_config, root_build_dir),
     ]
 
-    is_java_library = type == "java_library"
+    is_java = type == "java_library" || type == "java_binary"
     is_apk = type == "android_apk"
     is_android_assets = type == "android_assets"
     is_android_resources = type == "android_resources"
     is_deps_dex = type == "deps_dex"
 
     supports_android =
         is_apk || is_android_assets || is_android_resources || is_deps_dex ||
-        (is_java_library && defined(invoker.supports_android) &&
+        (is_java && defined(invoker.supports_android) &&
          invoker.supports_android)
     requires_android =
         is_apk || is_android_assets || is_android_resources || is_deps_dex ||
-        (is_java_library && defined(invoker.requires_android) &&
+        (is_java && defined(invoker.requires_android) &&
          invoker.requires_android)
 
     assert(!requires_android || supports_android,
            "requires_android requires" + " supports_android")
 
     # Mark these variables as used.
-    assert(is_java_library || true)
+    assert(is_java || true)
     assert(is_apk || true)
     assert(is_android_resources || true)
     assert(is_deps_dex || true)
 
-    if (is_java_library || is_apk) {
+    if (is_java || is_apk) {
       args += [
         "--jar-path",
         rebase_path(invoker.jar_path, root_build_dir),
       ]
     }
 
-    if (is_apk || is_deps_dex || (is_java_library && supports_android)) {
+    if (is_apk || is_deps_dex || (is_java && supports_android)) {
       args += [
         "--dex-path",
         rebase_path(invoker.dex_path, root_build_dir),
       ]
     }
     if (supports_android) {
       args += [ "--supports-android" ]
     }
     if (requires_android) {
       args += [ "--requires-android" ]
@@ skipping 1116 matching lines @@
                "java_library_impl($target_name), you should " +
                "also specify the target that made it in the deps")
     build_config_deps = invoker.deps
   } else {
     _build_config = _base_path + ".build_config"
     build_config_target_name = "${_template_name}__build_config"
     build_config_deps = [ ":$build_config_target_name" ]
 
     write_build_config(build_config_target_name) {
       forward_variables_from(invoker, [ "deps" ])
-      type = "java_library"
+      if (defined(invoker.is_java_binary) && invoker.is_java_binary) {
+        type = "java_binary"
+      } else {
+        type = "java_library"
+      }
       supports_android = _supports_android
       requires_android = _requires_android
       bypass_platform_checks = defined(invoker.bypass_platform_checks) &&
                                invoker.bypass_platform_checks
 
       build_config = _build_config
       jar_path = _jar_path
       if (_supports_android) {
         dex_path = _dex_path
       }
@@ skipping 444 matching lines @@
     ]
     args = [
       "--depfile",
       rebase_path(depfile, root_build_dir),
       "--script-output-path",
       rebase_path(generated_script, root_build_dir),
     ]
     args += test_runner_args
   }
 }