Fix GN build errors when splits are enabled.

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 01202c944b6fd3408848051080dd386018ad1a72..bb5493aeb28f1b8215a5159fdbfca282e718a49c 100644
--- a/build/config/android/rules.gni
+++ b/build/config/android/rules.gni
@@ -1454,7 +1454,15 @@ template("android_apk") {
     }
   }
 
+  # The manifest must be passed as a file (through android_manifest), and if it
+  # is a generated file, android_manifest_dep must specify the target that
+  # generated it.

[cjhopman, 2015/06/29 22:55:17]

This comment should probably go in with the target-level docstring (around
#1296).

[agrieve, 2015/06/30 02:04:35]

Done.

+  _android_manifest_deps = []
+  if (defined(invoker.android_manifest_dep)) {
+    _android_manifest_deps = [ invoker.android_manifest_dep ]
+  }
   _android_manifest = invoker.android_manifest
+
   _rebased_build_config = rebase_path(_build_config, root_build_dir)
   _create_abi_split =
       defined(invoker.create_abi_split) && invoker.create_abi_split
@@ -1472,7 +1480,7 @@ template("android_apk") {
     build_config = _build_config
     android_manifest = _android_manifest
 
-    deps = _chromium_linker_dep
+    deps = _chromium_linker_dep + _android_manifest_deps
     if (defined(invoker.deps)) {
       deps += invoker.deps
     }
@@ -1502,9 +1510,7 @@ template("android_apk") {
     }
 
     build_config = _build_config
-    deps = [
-      ":$build_config_target",
-    ]
+    deps = _android_manifest_deps + [ ":$build_config_target" ]
     if (defined(invoker.deps)) {
       deps += invoker.deps
     }
@@ -1553,9 +1559,7 @@ template("android_apk") {
     supports_android = true
     requires_android = true
     override_build_config = _build_config
-    deps = [
-      ":$build_config_target",
-    ]
+    deps = _android_manifest_deps + [ ":$build_config_target" ]
 
     android_manifest = _android_manifest
     chromium_code = true
@@ -1712,10 +1716,10 @@ template("android_apk") {
     keystore_password = _keystore_password
 
     # This target generates the input file _all_resources_zip_path.
-    deps = [
-      ":$process_resources_target",
-      ":$final_dex_target_name",
-    ]
+    deps = _android_manifest_deps + [
+             ":$process_resources_target",
+             ":$final_dex_target_name",
+           ]
     if (defined(invoker.deps)) {
       deps += invoker.deps
     }
@@ -1744,6 +1748,7 @@ template("android_apk") {
       out_manifest =
           "$gen_dir/split-manifests/${android_app_abi}/AndroidManifest.xml"
       split_name = "abi_${android_app_abi}"
+      deps = _android_manifest_deps
     }
 
     _apk_rule = "${_template_name}__split_apk_abi_${android_app_abi}"
@@ -1769,6 +1774,7 @@ template("android_apk") {
       native_libs_dir = _native_libs_dir
       deps = [
         ":${_template_name}__prepare_native",
+        ":${_manifest_rule}",
       ]
     }
   }