GN + Android: support standalone .dex.jar output of Android libraries.

build/config/android/rules.gni

Index: build/config/android/rules.gni
diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni
index a5c0b0acf333dcb48ab891bd49ba840a2a2ea410..09d84dac3ab2e4fd7a49fa1795c4b63d892ab3ec 100644
--- a/build/config/android/rules.gni
+++ b/build/config/android/rules.gni
@@ -815,6 +815,11 @@ template("java_prebuilt") {
 #     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") {
@@ -850,6 +855,7 @@ template("android_library") {
     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
@@ -1143,7 +1149,7 @@ template("android_apk") {
     sources = [ jar_path ]
     inputs = [ _build_config ]
     output = final_dex_path
-    dex_arg_key = "${_rebased_build_config}:apk_dex:dependency_dex_files"
+    dex_arg_key = "${_rebased_build_config}:final_dex:dependency_dex_files"
     args = [ "--inputs=@FileArg($dex_arg_key)" ]
   }