GN + Android: extract android_standalone_library rule.

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 48 matching lines @@
       "--enable",
     ]
   }
 }
 
 template("dex") {
   if (defined(invoker.testonly)) {
     testonly = invoker.testonly
   }
 
-  assert(defined(invoker.sources))
   assert(defined(invoker.output))
   action(target_name) {
     script = "//build/android/gyp/dex.py"
     depfile = "$target_gen_dir/$target_name.d"
-    sources = invoker.sources
+    if (defined(invoker.sources)) {
+      sources = invoker.sources
+    }
     outputs = [
       depfile,
       invoker.output,
     ]
     if (defined(invoker.inputs)) {
       inputs = invoker.inputs
     }
 
     if (defined(invoker.deps)) {
       deps = invoker.deps
@@ skipping 11 matching lines @@
     ]
 
     if (defined(invoker.no_locals) && invoker.no_locals) {
       args += [ "--no-locals=1" ]
     }
 
     if (defined(invoker.args)) {
       args += invoker.args
     }
 
-    args += rebase_path(invoker.sources, root_build_dir)
+    if (defined(invoker.sources)) {
+      args += rebase_path(invoker.sources, root_build_dir)
+    }
   }
 }
 
 # Creates a zip archive of the inputs.
 # If base_dir is provided, the archive paths will be relative to it.
 template("zip") {
   if (defined(invoker.testonly)) {
     testonly = invoker.testonly
   }
 
@@ skipping 39 matching lines @@
     testonly = invoker.testonly
   }
 
   assert(defined(invoker.type))
   assert(defined(invoker.build_config))
 
   type = invoker.type
   build_config = invoker.build_config
 
   assert(type == "android_apk" || type == "java_library" ||
-         type == "android_resources")
+         type == "android_resources" || type == "deps_dex")
 
   action(target_name) {
     script = "//build/android/gyp/write_build_config.py"
     depfile = "$target_gen_dir/$target_name.d"
     inputs = []
 
     deps = []
     if (defined(invoker.deps)) {
       deps += invoker.deps
     }
@@ skipping 17 matching lines @@
       "--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_apk = type == "android_apk"
     is_android_resources = type == "android_resources"
+    is_deps_dex = type == "deps_dex"
 
-    supports_android = is_apk || is_android_resources ||
+    supports_android = is_apk || is_android_resources || is_deps_dex ||
                        (is_java_library && defined(invoker.supports_android) &&
                         invoker.supports_android)
-    requires_android = is_apk || is_android_resources ||
+    requires_android = is_apk || is_android_resources || is_deps_dex ||
                        (is_java_library && 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_apk || true)
     assert(is_android_resources || true)
+    assert(is_deps_dex || true)
 
     if (is_java_library || is_apk) {
       args += [
         "--jar-path",
         rebase_path(invoker.jar_path, root_build_dir),
       ]
     }
 
-    if (is_apk || (is_java_library && supports_android)) {
+    if (is_apk || is_deps_dex || (is_java_library && 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 653 matching lines @@
       }
     }
 
     _final_deps += [ ":${_template_name}__dex" ]
     dex("${_template_name}__dex") {
       sources = [
         _jar_path,
       ]
       output = _dex_path
     }
-
-    if (defined(invoker.standalone_dex_path)) {
-      _final_deps += [ ":${_template_name}__standalone_dex" ]
-      _rebased_build_config = rebase_path(_build_config, root_build_dir)
-      dex("${_template_name}__standalone_dex") {
-        sources = [
-          _jar_path,
-        ]
-        inputs = [
-          _build_config,
-        ]
-        output = invoker.standalone_dex_path
-        dex_arg_key = "${_rebased_build_config}:final_dex:dependency_dex_files"
-        args = [ "--inputs=@FileArg($dex_arg_key)" ]
-      }
-    }
   }
 
   group(target_name) {
     if (defined(invoker.visibility)) {
       visibility = invoker.visibility
     }
     deps = _final_deps
     datadeps = _final_datadeps
   }
 }
@@ skipping 127 matching lines @@
 
     if (defined(invoker.clear_dir) && invoker.clear_dir) {
       args += [ "--clear" ]
     }
 
     if (defined(invoker.args)) {
       args += invoker.args
     }
   }
 }
+
+# Produces a single .dex.jar out of a set of Java dependencies.
+template("deps_dex") {
+  build_config = "$target_gen_dir/${target_name}.build_config"
+  write_build_config("${target_name}__build_config") {
+    type = "deps_dex"
+    deps = invoker.deps
+
+    build_config = build_config
+    dex_path = invoker.dex_path
+  }
+
+  rebased_build_config = rebase_path(build_config, root_build_dir)
+  dex(target_name) {
+    inputs = [
+      build_config,
+    ]
+    output = invoker.dex_path
+    dex_arg_key = "${rebased_build_config}:final_dex:dependency_dex_files"
+    args = [ "--inputs=@FileArg($dex_arg_key)" ]
+  }
+}