GN + Android: extract android_standalone_library rule.

build/config/android/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("//base/android/linker/config.gni")
 import("//build/config/android/config.gni")
 import("//build/config/android/internal_rules.gni")
 import("//tools/grit/grit_rule.gni")
 import("//tools/relocation_packer/config.gni")
 
@@ skipping 904 matching lines @@
 #   chromium_code: If true, extra analysis warning/errors will be enabled.
 #   jar_excluded_patterns: List of patterns of .class files to exclude from the
 #     final jar.
 #
 #   proguard_preprocess: If true, proguard preprocessing will be run. This can
 #     be used to remove unwanted parts of the library.
 #   proguard_config: Path to the proguard config for preprocessing.
 #
 #   dex_path: If set, the resulting .dex.jar file will be placed under this
 #     path.
-#   standalone_dex_path: If set, a standalone .dex.jar containing the code from
-#     the library and all dependencies will be placed under this path.
 #
 #
 # Example
 #   android_library("foo_java") {
 #     java_files = [
 #       "android/org/chromium/foo/Foo.java",
 #       "android/org/chromium/foo/FooInterface.java",
 #       "android/org/chromium/foo/FooService.java",
 #     ]
 #     deps = [
@@ skipping 42 matching lines @@
     }
     if (defined(invoker.testonly)) {
       testonly = invoker.testonly
     }
     if (defined(invoker.visibility)) {
       visibility = invoker.visibility
     }
     if (defined(invoker.dex_path)) {
       dex_path = invoker.dex_path
     }
-    if (defined(invoker.standalone_dex_path)) {
-      standalone_dex_path = invoker.standalone_dex_path
-    }
 
     supports_android = true
     requires_android = true
 
     if (!defined(jar_excluded_patterns)) {
       jar_excluded_patterns = []
     }
     jar_excluded_patterns += [
       "*/R.class",
       "*/R##*.class",
       "*/Manifest.class",
       "*/Manifest##*.class",
     ]
   }
 }
 
+# Declare a target that packages a set of Java dependencies into a standalone
+# .dex.jar.
+#
+# Variables
+#   deps: specifies the dependencies of this target. Android libraries and
+#     resources in deps will be packaged into the resulting .dex.jar file.
+#   standalone_dex_path: optional override for the output file location.
+template("android_standalone_library") {
+  deps_dex(target_name) {
+    deps = invoker.deps
+    if (defined(invoker.standalone_dex_path)) {
+      standalone_dex_path = invoker.standalone_dex_path

[cjhopman, 2014/12/08 21:27:51]

I think you should require the invoker to specify the path for the dex.
Otherwise, the only useful way to use a target of this type would be to refer to
the generated output path and we typically don't want people doing that (because
we want to be free to change anything that the invoker doesn't specify).

Also, maybe just 'dex_path'.

[ppi, 2014/12/09 15:17:29]

Done.

+    } else {
+      standalone_dex_path = "$target_out_dir/$target_name.dex.jar"
+    }
+  }
+}
+
 # Declare an Android library target for a prebuilt jar
 #
 # This target creates an Android library containing java code and Android
 # resources.
 #
 # Variables
 #   deps: Specifies the dependencies of this target. Java targets in this list
 #     will be added to the javac classpath. Android resources in dependencies
 #     will be used when building this library.
 #   jar_path: Path to the prebuilt jar.
@@ skipping 658 matching lines @@
 # TODO(GYP): implement this.
 template("uiautomator_test") {
   if (defined(invoker.testonly)) {
     testonly = invoker.testonly
   }
   assert(target_name != "")
   assert(invoker.deps != [] || true)
   group(target_name) {
   }
 }